diff --git a/app-shells/bash/bash-4.3_p39.ebuild b/app-shells/bash/bash-4.3_p39.ebuild
index 9c19bc40abe57..ffa0c3e4dc5f7 100644
--- a/app-shells/bash/bash-4.3_p39.ebuild
+++ b/app-shells/bash/bash-4.3_p39.ebuild
@@ -38,7 +38,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2
diff --git a/dev-vcs/git-imerge/git-imerge-0.7.0.ebuild b/dev-vcs/git-imerge/git-imerge-0.7.0.ebuild
index 1b45ef09d31f7..8013aa26473a2 100644
--- a/dev-vcs/git-imerge/git-imerge-0.7.0.ebuild
+++ b/dev-vcs/git-imerge/git-imerge-0.7.0.ebuild
@@ -18,7 +18,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}"
+RDEPEND="${PYTHON_DEPS}
+	dev-vcs/git"
 DEPEND="dev-python/docutils"
 
 src_compile() {
diff --git a/dev-vcs/git/git-1.8.5.6.ebuild b/dev-vcs/git/git-1.8.5.6.ebuild
index 35cb3cba4fb3a..76127c2183dc6 100644
--- a/dev-vcs/git/git-1.8.5.6.ebuild
+++ b/dev-vcs/git/git-1.8.5.6.ebuild
@@ -41,11 +41,11 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv media
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
-	dev-libs/openssl
+	dev-libs/openssl:0
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk )
+	tk? ( dev-lang/tk:0 )
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
diff --git a/dev-vcs/git/git-1.9.5.ebuild b/dev-vcs/git/git-1.9.5.ebuild
index a6dbd35c558c4..9f7bf8739b3fc 100644
--- a/dev-vcs/git/git-1.9.5.ebuild
+++ b/dev-vcs/git/git-1.9.5.ebuild
@@ -41,11 +41,11 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv media
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
-	dev-libs/openssl
+	dev-libs/openssl:0
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk )
+	tk? ( dev-lang/tk:0 )
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
diff --git a/dev-vcs/git/git-2.0.5.ebuild b/dev-vcs/git/git-2.0.5.ebuild
index 5f98b89b27060..a32d348947001 100644
--- a/dev-vcs/git/git-2.0.5.ebuild
+++ b/dev-vcs/git/git-2.0.5.ebuild
@@ -42,11 +42,11 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv media
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
-	dev-libs/openssl
+	dev-libs/openssl:0
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk )
+	tk? ( dev-lang/tk:0 )
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
diff --git a/dev-vcs/git/git-2.1.4.ebuild b/dev-vcs/git/git-2.1.4.ebuild
index 99af16d8ff14d..c5795d53cca4f 100644
--- a/dev-vcs/git/git-2.1.4.ebuild
+++ b/dev-vcs/git/git-2.1.4.ebuild
@@ -42,11 +42,11 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv media
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
-	dev-libs/openssl
+	dev-libs/openssl:0
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk )
+	tk? ( dev-lang/tk:0 )
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
diff --git a/dev-vcs/git/git-2.2.2.ebuild b/dev-vcs/git/git-2.2.2.ebuild
index e08073637cb26..7833180496cf9 100644
--- a/dev-vcs/git/git-2.2.2.ebuild
+++ b/dev-vcs/git/git-2.2.2.ebuild
@@ -42,11 +42,11 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv media
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
-	dev-libs/openssl
+	dev-libs/openssl:0
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk )
+	tk? ( dev-lang/tk:0 )
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
diff --git a/dev-vcs/git/git-2.3.6.ebuild b/dev-vcs/git/git-2.3.6.ebuild
index a9e214a5586b7..6c37a41a0ef5e 100644
--- a/dev-vcs/git/git-2.3.6.ebuild
+++ b/dev-vcs/git/git-2.3.6.ebuild
@@ -46,7 +46,7 @@ CDEPEND="
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:= )
+	tk? ( dev-lang/tk:0= )
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
diff --git a/dev-vcs/git/git-2.3.8.ebuild b/dev-vcs/git/git-2.3.8.ebuild
index 57119c41ba270..8081acf9eafac 100644
--- a/dev-vcs/git/git-2.3.8.ebuild
+++ b/dev-vcs/git/git-2.3.8.ebuild
@@ -46,7 +46,7 @@ CDEPEND="
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:= )
+	tk? ( dev-lang/tk:0= )
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
diff --git a/dev-vcs/git/git-2.4.6.ebuild b/dev-vcs/git/git-2.4.6.ebuild
index 353af845b6020..522da1ad9c831 100644
--- a/dev-vcs/git/git-2.4.6.ebuild
+++ b/dev-vcs/git/git-2.4.6.ebuild
@@ -46,7 +46,7 @@ CDEPEND="
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:= )
+	tk? ( dev-lang/tk:0= )
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
diff --git a/dev-vcs/git/git-2.4.7.ebuild b/dev-vcs/git/git-2.4.7.ebuild
index 51d72b78d1338..3949decb094ae 100644
--- a/dev-vcs/git/git-2.4.7.ebuild
+++ b/dev-vcs/git/git-2.4.7.ebuild
@@ -46,7 +46,7 @@ CDEPEND="
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:= )
+	tk? ( dev-lang/tk:0= )
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
diff --git a/dev-vcs/git/git-2.4.8.ebuild b/dev-vcs/git/git-2.4.8.ebuild
index 51d72b78d1338..3949decb094ae 100644
--- a/dev-vcs/git/git-2.4.8.ebuild
+++ b/dev-vcs/git/git-2.4.8.ebuild
@@ -46,7 +46,7 @@ CDEPEND="
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:= )
+	tk? ( dev-lang/tk:0= )
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
diff --git a/dev-vcs/git/git-2.5.0.ebuild b/dev-vcs/git/git-2.5.0.ebuild
index 51d72b78d1338..3949decb094ae 100644
--- a/dev-vcs/git/git-2.5.0.ebuild
+++ b/dev-vcs/git/git-2.5.0.ebuild
@@ -46,7 +46,7 @@ CDEPEND="
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:= )
+	tk? ( dev-lang/tk:0= )
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 33e56c7af66d1..34f3ccbd5394a 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -42,11 +42,11 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv media
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
-	dev-libs/openssl
+	dev-libs/openssl:0
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk )
+	tk? ( dev-lang/tk:0 )
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 1de365110da5e..116f5e5dedc3f 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -42,11 +42,11 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv media
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
-	dev-libs/openssl
+	dev-libs/openssl:0
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk )
+	tk? ( dev-lang/tk:0 )
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index ce40cc0215985..e2e526065dc77 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -42,11 +42,11 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv media
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
-	dev-libs/openssl
+	dev-libs/openssl:0
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk )
+	tk? ( dev-lang/tk:0 )
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index af5415ec077e2..51f35f02223b0 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -42,11 +42,11 @@ IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv media
 
 # Common to both DEPEND and RDEPEND
 CDEPEND="
-	dev-libs/openssl
+	dev-libs/openssl:0
 	sys-libs/zlib
 	pcre? ( dev-libs/libpcre )
 	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk )
+	tk? ( dev-lang/tk:0 )
 	curl? (
 		net-misc/curl
 		webdav? ( dev-libs/expat )
diff --git a/sci-libs/libspatialindex/Manifest b/sci-libs/libspatialindex/Manifest
index 2c2b65e746c3a..fac2bed56f04b 100644
--- a/sci-libs/libspatialindex/Manifest
+++ b/sci-libs/libspatialindex/Manifest
@@ -2,3 +2,4 @@ DIST spatialindex-src-1.8.0.tar.bz2 365131 SHA256 088b675085aa0b8f0c7c8e795e9d2d
 DIST spatialindex-src-1.8.1.tar.bz2 368252 SHA256 9e57b07ccd64b2940ac42739382e84492716f186892ba81c0d2a636ca6de3bcd SHA512 34fc743d8fac65a60ae723e3261e8f3717df8bd5997f7338b8d944e9a832d6bad33a4b7cfa4b2f1e5ba0fdbd3ebb4b199e247f0e7b7473953b433e203c21e548 WHIRLPOOL af43858abc094a17e7ae83828693ef7f1fcae3dc2e5bc40eae174c5c441bfee17c55ce151ba4fbdcb314996d8197c47bfcbfafb692af772b9c6d4187a9962227
 DIST spatialindex-src-1.8.3.tar.bz2 406600 SHA256 c16e050d003936d873ece5929502656696cbf160cb044c9efe5fd67d1ab68f34 SHA512 deb2c5d9049652f5f6f8cd74b225fc1cc7e152340efe66fcad4653419d2f53787408f5246f0454f4800b5c6bb0ea55aa4fbfe8113d1c8d939da6511e5ce27a20 WHIRLPOOL 80aa07e60ee9f9f4195dec1d08ea931c32cfdb89a2136d7d2a8975d57566882227ee62573906e3ccc986a44bcb7fa9bc900ea32eb50b0f8b90be26c27dffcd9a
 DIST spatialindex-src-1.8.4.tar.bz2 406604 SHA256 8428a0990301160c3ac1995531e450a50e4b6d572fd6ac7faa24341a916c95b1 SHA512 a0a8c00e201d2247ce183c6f3af4e94944ffd0190d9efcd2842e6ffa95a1dcc5a72a66ac1658545285fd2efed4cb60c7880e1113f11a7fa1c5a7b8a5ac6a31e5 WHIRLPOOL 30e71dcd36412442ea1deaf8cf52bb9aa7b81a0154b9d0c9a1adee8e2f82bcaf2618311d9ea3256d2fd82d95192fb3b26542c0b510638648975d860b31a34abe
+DIST spatialindex-src-1.8.5.tar.bz2 407871 SHA256 31ec0a9305c3bd6b4ad60a5261cba5402366dd7d1969a8846099717778e9a50a SHA512 d3e47982cc2809d04490fae27796b31cdb59675790010d8b45e1a98b5a23048a4a44e321a2470dd36c01aba6f6e7620cafc4988a02b55e4f59d1b7fa9b588b06 WHIRLPOOL 498fc14ff9aea93a362cf7719e20f77bd84b5f6be94e8b1bfb3bbb00bb04d2bf1e9cc1156090c8f7f37e0ca4b64ac5701e1c91476591f401bf9f738b0d6efa1f
diff --git a/sci-libs/libspatialindex/libspatialindex-1.8.5.ebuild b/sci-libs/libspatialindex/libspatialindex-1.8.5.ebuild
new file mode 100644
index 0000000000000..da88a264cdb17
--- /dev/null
+++ b/sci-libs/libspatialindex/libspatialindex-1.8.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils
+
+MY_PN="spatialindex-src"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="General framework for developing spatial indices"
+HOMEPAGE="http://libspatialindex.github.com/"
+SRC_URI="http://download.osgeo.org/libspatialindex/${MY_P}.tar.bz2"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0/4"
+IUSE="debug static-libs"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8.1-QA.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+	use static-libs || prune_libtool_files
+}
diff --git a/x11-misc/devilspie2/Manifest b/x11-misc/devilspie2/Manifest
index 8e47f635d466d..199f2ef436b05 100644
--- a/x11-misc/devilspie2/Manifest
+++ b/x11-misc/devilspie2/Manifest
@@ -1,2 +1,3 @@
+DIST devilspie2-0.39.tar.gz 45042 SHA256 95d7ca93c66ef511bdd2ea5d301a2e84b5a8175a5a89f4d29859c8a84ed7801c SHA512 4f84ddc6efe6a73290bc9f069790abc80b8377e66919a424d18e8814b9dd6293e87358cc6856a470aaa60454e89ae8bd57ee7356efaaffd09b027873ea25df3c WHIRLPOOL 024d79263527c2b25df26b49e75bd615ebda4bb7f730d107c3209f374b450c2c21072e3a0c63d2de54c1c3363fe26d2c9250a8cb0ffda61d0136ebcffa6d5482
 DIST devilspie2_0.36-src.tar.gz 44818 SHA256 7d0c2982d65f4dfc9d64f29f72252cce3354231938bc79da8034edfb3394ae11 SHA512 5ab755e7b2f12c0d6304a7ce4a25c95f1cb5d11eec42da0902239e37e2f637663706a21b2d69643f423b8fd597761283fc7a0efc8c201e1f07e503a2057fefd6 WHIRLPOOL 2a6aac66c8fe9e5a0eb8099eca835bc1a7382627e662fdbd70f598a4ead478ca9d8a8510a6ce353f2a186ac94f71a5df67375dd91a3dbd4c9cc001854d1cc6fa
 DIST devilspie2_0.37-src.tar.gz 44722 SHA256 463db05b85723f571e16034b3c9281bdcc3a2cffcaa2cf056580575ee8a421b6 SHA512 1eaf7d6a5074179d1a3b356ed25e0243bb177e8d408797a8efe230ae1b737d18f52442a69f92a3f47cece2d91c70b4c7d9cb378183eb353f0e163ac772f9478e WHIRLPOOL a58c6137415108c10e603e4c095309038801b2a82dfa0ea1befd8a03b62d341fdf3015314df0ebb0f81f43b481c3661b6904ef28a1899bd52aeb98922dcd509a
diff --git a/x11-misc/devilspie2/devilspie2-0.39.ebuild b/x11-misc/devilspie2/devilspie2-0.39.ebuild
new file mode 100644
index 0000000000000..eddb4cc689b66
--- /dev/null
+++ b/x11-misc/devilspie2/devilspie2-0.39.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# check locales on version bump!
+PLOCALES="fi fr ja nl pt_BR ru sv"
+inherit flag-o-matic toolchain-funcs l10n
+
+DESCRIPTION="Devilspie like window matching utility, using LUA for scripting"
+HOMEPAGE="http://devilspie2.gusnan.se"
+SRC_URI="http://git.savannah.gnu.org/cgit/devilspie2.git/snapshot/devilspie2-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2.32.4:2
+	>=dev-lang/lua-5.1.5:0
+	>=x11-libs/gtk+-3.4.4:3
+	>=x11-libs/libwnck-3.4.4:3
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto"
+
+src_prepare() {
+	use debug && append-cflags -D_DEBUG
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) PREFIX="/usr" LANGUAGES="$(l10n_get_locales)"
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" LANGUAGES="$(l10n_get_locales)" install
+
+	dodoc AUTHORS ChangeLog README README.translators TODO VERSION
+	doman devilspie2.1
+}
+
+pkg_postinst() {
+	elog "Default directory for scripts is ~/.config/devilspie2/"
+}