diff --git a/app-admin/apache-tools/apache-tools-2.4.23.ebuild b/app-admin/apache-tools/apache-tools-2.4.23.ebuild
index 51048c9ae473..b0a673ddcd4d 100644
--- a/app-admin/apache-tools/apache-tools-2.4.23.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"
 
diff --git a/app-misc/dvorakng/dvorakng-0.6.0.ebuild b/app-misc/dvorakng/dvorakng-0.6.0.ebuild
index f90b50fedd55..e6a8abada5cf 100644
--- a/app-misc/dvorakng/dvorakng-0.6.0.ebuild
+++ b/app-misc/dvorakng/dvorakng-0.6.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="Dvorak typing tutor"
@@ -11,17 +12,25 @@ SRC_URI="http://www.free.of.pl/n/nopik/${P}rc1.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	sys-libs/ncurses:*
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
 
-S=${WORKDIR}/dvorakng
+S=${WORKDIR}/${PN}
 
 src_compile() {
-	emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
+	emake \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
 }
 
 src_install() {
-	dobin dvorakng || die "dobin failed"
-	dodoc README TODO || die "dodoc failed"
+	dobin ${PN}
+	dodoc README TODO
 }
diff --git a/app-shells/bash/files/bash-3.0-read-e-segfault.patch b/app-shells/bash/files/bash-3.0-read-e-segfault.patch
deleted file mode 100644
index e578631c424e..000000000000
--- a/app-shells/bash/files/bash-3.0-read-e-segfault.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-> Hmm, a better patch for this seems to be:
-
-I installed this patch a while back:
-
-*** ../bash-3.0-patched/lib/readline/display.c	Wed Sep  8 11:07:51 2004
---- lib/readline/display.c	Fri Nov 12 13:31:42 2004
-***************
-*** 336,340 ****
-  
-    local_prompt = local_prompt_prefix = (char *)0;
-!   prompt_last_invisible = prompt_visible_length = 0;
-  
-    if (prompt == 0 || *prompt == 0)
---- 341,346 ----
-  
-    local_prompt = local_prompt_prefix = (char *)0;
-!   prompt_last_invisible = prompt_invis_chars_first_line = 0;
-!   prompt_visible_length = prompt_physical_chars = 0;
-  
-    if (prompt == 0 || *prompt == 0)
-
--- 
-``The lyf so short, the craft so long to lerne.'' - Chaucer
-( ``Discere est Dolere'' -- chet )
-						Live...Laugh...Love
-Chet Ramey, ITS, CWRU    chet@po.cwru.edu    http://tiswww.tis.cwru.edu/~chet/
diff --git a/app-shells/scsh/files/0.6.6-Makefile.in-doc-dir-gentoo.patch b/app-shells/scsh/files/0.6.6-Makefile.in-doc-dir-gentoo.patch
deleted file mode 100644
index 28f0f17c0140..000000000000
--- a/app-shells/scsh/files/0.6.6-Makefile.in-doc-dir-gentoo.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- Makefile.in.orig	2004-09-24 01:43:55.743685848 +0200
-+++ Makefile.in	2004-09-24 01:43:55.745685544 +0200
-@@ -33,7 +33,7 @@
- host = @host@
- ### End of `configure' section###
- 
--htmldir = $(libdir)/scsh/doc/scsh-manual/html
-+htmldir = /usr/share/doc/scsh-0.6.6/scsh-manual/html
- 
- # HP 9000 series, if you don't have gcc
- #   CC = cc
-@@ -358,38 +358,38 @@
- 	done 
- 
- inst-doc:
--	for f in $(srcdir)/doc/*.txt $(srcdir)/doc/*.ps; do \
--		$(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/doc/; 			\
-+	for f in $(srcdir)/doc/*.txt $(srcdir)/doc/*.ps; do 			\
-+	$(INSTALL_DATA) $$f $(DESTDIR)/usr/share/doc/scsh-0.6.6/; 		\
- 	done &&									\
- 	for f in $(srcdir)/doc/src/*.tex 					\
- 		$(srcdir)/doc/src/*.dvi						\
- 		$(srcdir)/doc/src/*.ps;						\
--		do $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/doc/s48-manual/;	\
-+         do $(INSTALL_DATA) $$f $(DESTDIR)/usr/share/doc/scsh-0.6.6/s48-manual/;\
- 	done &&									\
- 	for f in $(srcdir)/doc/src/manual/*.html;				\
--		do $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/doc/s48-manual/html/;	\
-+    do $(INSTALL_DATA) $$f $(DESTDIR)/usr/share/doc/scsh-0.6.6/s48-manual/html/;\
- 	done &&									\
- 	for f in $(srcdir)/doc/scsh-manual/*.tex 				\
- 		$(srcdir)/doc/scsh-manual/*.sty 				\
- 		$(srcdir)/doc/scsh-manual/*.dvi					\
- 		$(srcdir)/doc/scsh-manual/*.ps					\
- 		$(srcdir)/doc/scsh-manual/*.pdf;				\
--		do $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/doc/scsh-manual/;	\
-+	do $(INSTALL_DATA) $$f $(DESTDIR)/usr/share/doc/scsh-0.6.6/scsh-manual/;\
- 	done &&									\
- 	for f in $(srcdir)/doc/scsh-manual/html/*.html 				\
- 		$(srcdir)/doc/scsh-manual/html/*.gif 				\
- 		$(srcdir)/doc/scsh-manual/html/*.css;				\
--		do $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/;			\
-+		do $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir)/;        		\
- 	done &&									\
- 	for f in $(srcdir)/doc/scsh-paper/*.tex 				\
- 		$(srcdir)/doc/scsh-paper/*.sty 					\
- 		$(srcdir)/doc/scsh-paper/*.dvi					\
- 		$(srcdir)/doc/scsh-paper/*.ps;					\
--		do $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/doc/scsh-paper/;	\
-+	do $(INSTALL_DATA) $$f $(DESTDIR)/usr/share/doc/scsh-0.6.6/scsh-paper/;	\
- 	done &&									\
- 	for f in $(srcdir)/doc/scsh-paper/html/*.html 				\
- 		$(srcdir)/doc/scsh-paper/html/*.css;				\
--		do $(INSTALL_DATA) $$f $(DESTDIR)$(LIB)/doc/scsh-paper/html;	\
-+    do $(INSTALL_DATA) $$f $(DESTDIR)/usr/share/doc/scsh-0.6.6/scsh-paper/html/;\
- 	done
- 
- 
-@@ -412,19 +412,21 @@
- 	chmod +x $@
- 
- dirs:
--	for dir in $(libdir) $(bindir) $(incdir) $(LIB) $(mandir) $(htmldir); do\
--		{ mkdir -p $(DESTDIR)$$dir && [ -w $(DESTDIR)$$dir ]; } || {	\
--			echo "$(DESTDIR)$$dir not a writable directory" >&2;	\
--			exit 1;						\
--	}								\
--	done &&								\
--	for dir in								\
--		rts env big opt misc link srfi scsh doc/scsh-manual			\
--		doc/s48-manual/html doc/scsh-paper/html cig; do			\
--		{ mkdir -p $(DESTDIR)$(LIB)/$$dir && [ -w $(DESTDIR)$(LIB)/$$dir ]; } || {	\
--			echo "$(DESTDIR)$(LIB)/$$dir not a writable directory" >&2; 	\
--		exit 1;						  		\
--		};							  	\
-+	for dir in $(libdir) $(bindir) $(incdir) $(LIB) $(mandir) $(htmldir);  \
-+		do                                                             \
-+	   { mkdir -p $(DESTDIR)$$dir && [ -w $(DESTDIR)$$dir ]; }             \
-+	|| { echo "$(DESTDIR)$$dir not a writable directory" >&2; exit 1; };   \
-+	done &&								       \
-+	for dir in rts env big opt misc link srfi scsh;                        \
-+	        do                                                             \
-+        { mkdir -p $(DESTDIR)$(LIB)/$$dir && [ -w $(DESTDIR)$(LIB)/$$dir ];}   \
-+     || { echo "$(DESTDIR)$(LIB)/$$dir not a writable directory" >&2; exit 1;};\
-+	done &&                                                                \
-+	for dir in                                                             \
-+	  scsh-manual/html s48-manual/html scsh-paper/html cig; do      \
-+	{ mkdir -p $(DESTDIR)/usr/share/doc/scsh-0.6.6/$$dir; }                \
-+     || { echo "mkdir -p $(DESTDIR)/usr/share/doc/scsh-0.6.6/$$dir failed" >&2;\
-+	  exit 1;};                                                            \
- 	done
- 
- configure: configure.in
diff --git a/app-shells/tcsh/files/tcsh-6.15.00-normalize-command-fix.patch b/app-shells/tcsh/files/tcsh-6.15.00-normalize-command-fix.patch
deleted file mode 100644
index b3b27ef7f14a..000000000000
--- a/app-shells/tcsh/files/tcsh-6.15.00-normalize-command-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugs.gw.com/view.php?id=53
-
-diff -uNr tcsh-6.15.00.orig/tw.parse.c tcsh-6.15.00/tw.parse.c
---- tcsh-6.15.00.orig/tw.parse.c	2007-03-01 23:21:42.000000000 +0200
-+++ tcsh-6.15.00/tw.parse.c	2007-06-30 20:10:54.000000000 +0300
-@@ -433,7 +433,7 @@
- 	Char *p;
- 	int found;
- 
--	found = !cmd_expand(qline.s + wordp, &p);
-+	found = cmd_expand(qline.s + wordp, &p);
- 	
- 	if (!found) {
- 	    xfree(p);
diff --git a/app-text/liblangtag/Manifest b/app-text/liblangtag/Manifest
index ad706ae21bcf..2c8e91fe156b 100644
--- a/app-text/liblangtag/Manifest
+++ b/app-text/liblangtag/Manifest
@@ -1,2 +1,3 @@
 DIST liblangtag-0.5.6.tar.bz2 668949 SHA256 5cdec61f4ef8d4b1a198682fcdd17e88cb293549af5878d6ee4bdd55d129bd84 SHA512 60297d79b20c72a0ebf5fd685efbcb3eb2d40461cfe532fd5e4f2193c81c9037b8c69f9cb0977f640a7d8f315cb14508de9455334115b152ed30d23f91d75e52 WHIRLPOOL 0805c9dcde9802818ec4e19309eb9b09e4dfe77627fefcb190203110b9ec133083d48c0474171368e1b061612f1e06bc936d1dc1ad1ad551dd276afe3db26fb5
 DIST liblangtag-0.5.8.tar.bz2 672452 SHA256 08e2f64bfe3f750be7391eb0af53967e164b628c59f02be4d83789eb4f036eaa SHA512 477f74d8b7eab66e5c503942117d8b448dd9d1b13866b3ec48388058bc0e5e4c6215ece88405fd947515cd092853f069d70b3fe2f307a9b41cb697b6b1dc3baf WHIRLPOOL 7036649534870e34dab5f68f1a97c5aee4649df6cc076026795f09775efca7a00b3eb047743aef3efeccd901add3942e6c9f5c097124193cdd57463a250ef133
+DIST liblangtag-0.6.0.tar.bz2 760974 SHA256 df84efd7e3e67cc8a38ece1e23f080c70ea29b26590ee324d03f1df37bf46576 SHA512 d6a2e38e11a5413408fffc1f8defc2a556a3a4b73538d01592ba7a3cad9768c52a030103893c8924f02328edc3f62a232c5efc1d74ddb41f41b146d8a9f0df27 WHIRLPOOL 72e6cddfe9e49b48dd0db3ef33ef92d087ff56fc7b65aabe6ae9a2f63d89ca98bfb4628c677a01251b4722ee42d9cb236cf4c184c1d7f27c3bcf04a54a4e4dee
diff --git a/app-text/liblangtag/liblangtag-0.6.0.ebuild b/app-text/liblangtag/liblangtag-0.6.0.ebuild
new file mode 100644
index 000000000000..c431d7c9734c
--- /dev/null
+++ b/app-text/liblangtag/liblangtag-0.6.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="An interface library to access tags for identifying languages"
+HOMEPAGE="https://tagoh.bitbucket.org/liblangtag/"
+SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="introspection static-libs test"
+
+RDEPEND="
+	dev-libs/glib:*
+	dev-libs/libxml2
+	introspection? ( >=dev-libs/gobject-introspection-0.10.8 )"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc
+	sys-devel/gettext
+	introspection? ( dev-libs/gobject-introspection-common )
+	test? ( dev-libs/check )"
+
+# Upstream expect liblangtag to be installed when one runs tests...
+RESTRICT="test"
+
+src_configure() {
+	econf \
+		$(use_enable introspection) \
+		$(use_enable static-libs static) \
+		$(use_enable test)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/dev-java/cssparser/Manifest b/dev-java/cssparser/Manifest
index 7e9464a70516..bb0351c9acf5 100644
--- a/dev-java/cssparser/Manifest
+++ b/dev-java/cssparser/Manifest
@@ -1,2 +1 @@
-DIST cssparser-0.9.18-sources.jar 247345 SHA256 41a5a7ff5cbf264634cad4f36eb3b7711f652271b66f858ad690fb5d457f8a08 SHA512 626ba47e5c222fff5438976ec53cd595864036f12788d84661c40d81975f14361461e176484ce063a9451eb572f3f4a881e88521be36b2903e9ec88b6a6c34a9 WHIRLPOOL 70cccda4d6c205f65b09c01474cf2fa0588cfdaad2c011ccf8c82828ff2813abe082ef52a596bf1300c0c2a56185e818bbc672f845cbf66aa4035bdca77a53db
 DIST cssparser-0.9.19-sources.jar 241192 SHA256 a6213bad3c363e3402f0170b56e210e1e93344e0e158d710e402ac40ec11cd73 SHA512 635155a5d491749a366a36ec5501e8aae574947a63834b701f8a6fd61f262793b8d1d25e98ed5a6b336095e1270919a015b1654ce248421f3dbcffa04101b439 WHIRLPOOL 8b2a4216e9d546bb927d207d603d9112620233837f347b444fbd267478f60e3c6d8994d2b414a6dba22b2ba8c04c907aca35ea67c57278e3a25b30538677b41d
diff --git a/dev-java/cssparser/cssparser-0.9.18.ebuild b/dev-java/cssparser/cssparser-0.9.18.ebuild
deleted file mode 100644
index 9c9ad3eb277b..000000000000
--- a/dev-java/cssparser/cssparser-0.9.18.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI="5"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="API for parsing CSS 2 in Java"
-HOMEPAGE="http://cssparser.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-java/sac:0"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-JAVA_GENTOO_CLASSPATH="sac"
diff --git a/dev-java/cssparser/cssparser-0.9.19.ebuild b/dev-java/cssparser/cssparser-0.9.19.ebuild
index 4d9963ba4a1c..7d6ace081b07 100644
--- a/dev-java/cssparser/cssparser-0.9.19.ebuild
+++ b/dev-java/cssparser/cssparser-0.9.19.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://cssparser.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CDEPEND="dev-java/sac:0"
 
diff --git a/dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild b/dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild
index 2ad2cd284d9d..8efab36abe3d 100644
--- a/dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild
+++ b/dev-java/flyingsaucer/flyingsaucer-7-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.pdoubleya.com/projects/${PN}/downloads/r${PV}/${PN}-R${PV}fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="minimal svg ${JAVA_PKG_IUSE}"
 
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 0598f7dbe516..33d693407127 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -1,8 +1,4 @@
 DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc
-DIST jdk-8u91-linux-arm32-vfp-hflt-demos.tar.gz 10403988 SHA256 3314a782f16ba67c9a1647b5a04d5955c8f0005b864530be615d3206453cd364 SHA512 f8b421b2ec3a0d2ae460356f7573c2f05424664f0479b930d97cb41510373790b3538d415464e12958fd38d3f6367e75bf225262b79e823bb70d0d80abf9b65f WHIRLPOOL e6a7e2e5bf35d980915c427b21cd735ca7b74eb8213d7edf3d125f1a7183bf0a2a078c02ad74be1566802575f077ea1602f2190f098c968b9a4ea09958e20d5a
-DIST jdk-8u91-linux-arm32-vfp-hflt.tar.gz 81491339 SHA256 79dda1dec6ccd7130b5204e75d1a8300e5b02c18f70888697f51764a777e5339 SHA512 c0487836d09df1d23ac2118e2b2ed60a85bf54a0d706486d19c44b1c3226b0317f5a86780f9956fee49b3aa9d4ba90779ad0483a5dfdf6fa56bb9880e099e44b WHIRLPOOL b1ed11cd171ff03f7d4d1a6f0c771003e35274aab0c1954a152315853b6baf7c408e478197b5ac7a9660a2e74d40f9885dde30b29ade0ffea0e78e57ee54f57b
-DIST jdk-8u91-linux-arm64-vfp-hflt-demos.tar.gz 10425383 SHA256 f5e4f27491779adeb62a272a112cdaff242a1d9899dced2d35e3da1e709e84b2 SHA512 6e80d5ebe80d83759443a8f4835efb81f29b58ca1976f4570eaad33274b8333ccd831dba9f67938be2a709051b2e95abb5ee16b9f0d02f6de69b28292a27cae1 WHIRLPOOL 7cc4150c8a0f6704079e42a607bc237379c5d22f0f0f9480b168edb3b8e9314f027a5b6c0e7f951647ec48a0b4a54ea0c9aecc015929b8dae5fd16ba63a84392
-DIST jdk-8u91-linux-arm64-vfp-hflt.tar.gz 78321279 SHA256 3dededc2e31bfda0a129b1df394e37078f339aa99e82e56d35cabff28ccfeb3b SHA512 8c30135f317c366aa755e4342f04da83a3de4c840b7da6e4ccd740e5f1f1e86a4408d192de1cedaf333426c3d80ef7d9841488eec672fb77e2643f32df38148d WHIRLPOOL 208b25af0b65f1ff1088b6e61b6463ef44ee7ac6ff41ef1268c8ec16d871fade681bfd3f717e09f5be7765c25e212d4780912656effda95a35dfd09ddc63f31b
 DIST jdk-8u92-linux-i586-demos.tar.gz 55064676 SHA256 e89fac1a329cb4d4a09ce045dbedc44fe3d99efb32bdf8fda39c8ffa0533c36a SHA512 b3eed7bc92142c8811415d54f62bd1454f5755d1e7ec95e6f2c83569ccc3524465d1755784a9aa0d3170ab5b8b3204b5ab22e0f7c1bf074c1082a9d697a406e4 WHIRLPOOL 222acce19d625ad7b637831feeb31d0bda5ba36317e9e8dc924e94e818cafcb8a70a6f7ee625d0f05d15061bec1d52a74b2f5e24f61ae2f7c240e1e958b7a29a
 DIST jdk-8u92-linux-i586.tar.gz 183433226 SHA256 7203592329877735bb6259844a3a30640edc61920d132f952c40ab2e2014b224 SHA512 fcb2db52e8cb392de91ca914dae13bc7786954334e7df346619686837bceab9ca49699153d308d869499d2948c5eb67ae39583e28db3c63a537afd33f6b1226d WHIRLPOOL b8a6df77307627baa3f81f14fbd2e526f40a1b628772bd6ea7599068a0b88bdbe164a8de340414ddc363b6e7fa3054f4c687143aaf9c5b57716c492fb8545a17
 DIST jdk-8u92-linux-x64-demos.tar.gz 55132437 SHA256 afebf7ae44afc8ef1199dd02b32c1d50d1fb16b9bc4f4e2443bd8d4d122e2178 SHA512 89d24f188f5d80524d952eb16af0913eac6ef2184ec79f8116ed91927f30aad73d057e0160502545c1a5a6fd2cbaa42ce50d9df5a73504813132ad002215bea0 WHIRLPOOL 8c02e4c98408fd1d1dc5368fb67ec904a6145b569a2d59c36d64fefbf9630c835d74e302ac651b803d3be9ad2c34bc4b80b3c15714b2982ffae8e0262f2b58c2
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.91.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.91.ebuild
deleted file mode 100644
index 9840a6ffac15..000000000000
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.91.ebuild
+++ /dev/null
@@ -1,366 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils java-vm-2 prefix versionator
-
-# This URIs need to be updated when bumping!
-JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
-
-# This is a list of archs supported by this update.
-# Currently arm comes and goes.
-AT_AVAILABLE=( arm arm64 )
-
-# Sometimes some or all of the demos are missing, this is to not have to rewrite half
-# the ebuild when it happens.
-DEMOS_AVAILABLE=( arm arm64 )
-
-if [[ "$(get_version_component_range 4)" == 0 ]] ; then
-	S_PV="$(get_version_component_range 1-3)"
-else
-	MY_PV_EXT="u$(get_version_component_range 4)"
-	S_PV="$(get_version_component_range 1-4)"
-fi
-
-MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
-
-AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
-AT_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt.tar.gz"
-AT_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt.tar.gz"
-AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
-AT_x64_solaris="jdk-${MY_PV}-solaris-x64.tar.gz"
-AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
-AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg"
-
-DEMOS_amd64="jdk-${MY_PV}-linux-x64-demos.tar.gz"
-DEMOS_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt-demos.tar.gz"
-DEMOS_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt-demos.tar.gz"
-DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz"
-DEMOS_x64_solaris="jdk-${MY_PV}-solaris-x64-demos.tar.gz"
-DEMOS_sparc64_solaris="jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
-DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip"
-
-JCE_DIR="UnlimitedJCEPolicyJDK8"
-JCE_FILE="jce_policy-8.zip"
-
-DESCRIPTION="Oracle's Java SE Development Kit"
-HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-for d in "${AT_AVAILABLE[@]}"; do
-	SRC_URI+=" ${d}? ( $(eval "echo \${$(echo AT_${d/-/_})}")"
-	if has ${d} "${DEMOS_AVAILABLE[@]}"; then
-		SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )"
-	fi
-	SRC_URI+=" )"
-done
-unset d
-SRC_URI+=" jce? ( ${JCE_FILE} )"
-
-LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
-SLOT="1.8"
-KEYWORDS="~arm ~arm64"
-IUSE="alsa cups derby doc examples +fontconfig headless-awt javafx jce nsplugin pax_kernel selinux source"
-REQUIRED_USE="javafx? ( alsa fontconfig )"
-
-RESTRICT="fetch preserve-libs strip"
-QA_PREBUILT="*"
-
-# NOTES:
-#
-# * cups is dlopened.
-#
-# * libpng is also dlopened but only by libsplashscreen, which isn't
-#   important, so we can exclude that.
-#
-# * We still need to work out the exact AWT and JavaFX dependencies
-#   under MacOS. It doesn't appear to use many, if any, of the
-#   dependencies below.
-#
-RDEPEND="!x64-macos? (
-		!headless-awt? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXi
-			x11-libs/libXrender
-			x11-libs/libXtst
-		)
-		javafx? (
-			dev-libs/glib:2
-			dev-libs/libxml2:2
-			dev-libs/libxslt
-			media-libs/freetype:2
-			x11-libs/cairo
-			x11-libs/gtk+:2
-			x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXxf86vm
-			x11-libs/pango
-			virtual/opengl
-		)
-	)
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups )
-	doc? ( dev-java/java-sdk-docs:${SLOT} )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	!prefix? ( sys-libs/glibc:* )
-	selinux? ( sec-policy/selinux-java )"
-
-# A PaX header isn't created by scanelf so depend on paxctl to avoid
-# fallback marking. See bug #427642.
-DEPEND="app-arch/zip
-	jce? ( app-arch/unzip )
-	examples? ( x64-macos? ( app-arch/unzip ) )
-	pax_kernel? ( sys-apps/paxctl )"
-
-S="${WORKDIR}/jdk"
-
-check_tarballs_available() {
-	local uri=$1; shift
-	local dl= unavailable=
-	for dl in "${@}" ; do
-		[[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}"
-	done
-
-	if [[ -n "${unavailable}" ]] ; then
-		if [[ -z ${_check_tarballs_available_once} ]] ; then
-			einfo
-			einfo "Oracle requires you to download the needed files manually after"
-			einfo "accepting their license through a javascript capable web browser."
-			einfo
-			_check_tarballs_available_once=1
-		fi
-		einfo "Download the following files:"
-		for dl in ${unavailable}; do
-			einfo "  ${dl}"
-		done
-		einfo "at '${uri}'"
-		einfo "and move them to '${DISTDIR}'"
-		einfo
-		einfo "If the above mentioned urls do not point to the correct version anymore,"
-		einfo "please download the files from Oracle's java download archive:"
-		einfo
-		einfo "   http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jdk-${MY_PV}-oth-JPR"
-		einfo
-	fi
-}
-
-pkg_nofetch() {
-	local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") )
-	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then
-		distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
-	fi
-	check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
-
-	use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
-}
-
-src_unpack() {
-	if use x64-macos ; then
-		pushd "${T}" > /dev/null
-		mkdir dmgmount
-		hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
-			-mountpoint "${T}"/dmgmount
-		local update=$(get_version_component_range 4)
-		[[ ${#update} == 1 ]] && update="0${update}"
-		xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg
-		hdiutil detach "${T}"/dmgmount
-		zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv
-		mv Contents/Home "${WORKDIR}"/jdk${MY_PV}
-		popd > /dev/null
-		use jce && unpack "${JCE_FILE}"
-	else
-		default
-	fi
-
-	# Upstream is changing their versioning scheme every release around 1.8.0.*;
-	# to stop having to change it over and over again, just wildcard match and
-	# live a happy life instead of trying to get this new jdk1.8.0_05 to work.
-	mv "${WORKDIR}"/jdk* "${S}" || die
-}
-
-src_prepare() {
-	if use jce ; then
-		mv "${WORKDIR}"/${JCE_DIR} jre/lib/security/ || die
-	fi
-
-	if [[ -n ${JAVA_PKG_STRICT} ]] ; then
-		# Mark this binary early to run it now.
-		pax-mark Cm ./bin/javap
-
-		eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936."
-		eqawarn
-		eqawarn "$(./bin/javap -J-Duser.home=${T} -c sun.misc.PostVMInitHook || die)"
-	fi
-
-	# Remove the hook that calls Oracle's evil usage tracker. Not just
-	# because it's evil but because it breaks the sandbox during builds
-	# and we can't find any other feasible way to disable it or make it
-	# write somewhere else. See bug #559936 for details.
-	zip -d jre/lib/rt.jar sun/misc/PostVMInitHook.class || die
-}
-
-src_install() {
-	local dest="/opt/${P}"
-	local ddest="${ED}${dest#/}"
-
-	# Create files used as storage for system preferences.
-	mkdir jre/.systemPrefs || die
-	touch jre/.systemPrefs/.system.lock || die
-	touch jre/.systemPrefs/.systemRootModFile || die
-
-	if ! use alsa ; then
-		rm -vf jre/lib/*/libjsoundalsa.* || die
-	fi
-
-	if use headless-awt ; then
-		rm -vf {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
-		   {,jre/}bin/{javaws,policytool} \
-		   bin/appletviewer || die
-	fi
-
-	if ! use javafx ; then
-		rm -vf jre/lib/*/lib*{decora,fx,glass,prism}* \
-		   jre/lib/*/libgstreamer-lite.* {,jre/}lib/{,ext/}*fx* \
-		   bin/*javafx* bin/javapackager || die
-	fi
-
-	if ! use nsplugin ; then
-		rm -vf jre/lib/*/libnpjp2.* || die
-	else
-		local nsplugin=$(echo jre/lib/*/libnpjp2.*)
-	fi
-
-	# Even though plugins linked against multiple ffmpeg versions are
-	# provided, they generally lag behind what Gentoo has available.
-	rm -vf jre/lib/*/libavplugin* || die
-
-	dodoc COPYRIGHT
-	dodir "${dest}"
-	cp -pPR bin include jre lib man "${ddest}" || die
-
-	if use derby ; then
-		cp -pPR	db "${ddest}" || die
-	fi
-
-	if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}" ; then
-		cp -pPR demo sample "${ddest}" || die
-	fi
-
-	if use jce ; then
-		dodir "${dest}"/jre/lib/security/strong-jce
-		mv "${ddest}"/jre/lib/security/US_export_policy.jar \
-			"${ddest}"/jre/lib/security/strong-jce || die
-		mv "${ddest}"/jre/lib/security/local_policy.jar \
-			"${ddest}"/jre/lib/security/strong-jce || die
-		dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
-			"${dest}"/jre/lib/security/US_export_policy.jar
-		dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \
-			"${dest}"/jre/lib/security/local_policy.jar
-	fi
-
-	if use nsplugin ; then
-		local nsplugin_link=${nsplugin##*/}
-		nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.}
-		dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}"
-	fi
-
-	if use source ; then
-		cp -v src.zip "${ddest}" || die
-
-		if use javafx ; then
-			cp -v javafx-src.zip "${ddest}" || die
-		fi
-	fi
-
-	if [[ -d jre/lib/desktop ]] ; then
-		# Install desktop file for the Java Control Panel.
-		# Using ${PN}-${SLOT} to prevent file collision with jre and or
-		# other slots.  make_desktop_entry can't be used as ${P} would
-		# end up in filename.
-		newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \
-			sun-jcontrol-${PN}-${SLOT}.png || die
-		sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \
-			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
-			-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \
-			-e "s#Application;##" \
-			-e "/Encoding/d" \
-			jre/lib/desktop/applications/sun_java.desktop \
-			> "${T}"/jcontrol-${PN}-${SLOT}.desktop || die
-		domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop
-	fi
-
-	# Prune all fontconfig files so libfontconfig will be used and only install
-	# a Gentoo specific one if fontconfig is disabled.
-	# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html
-	rm "${ddest}"/jre/lib/fontconfig.*
-	if ! use fontconfig ; then
-		cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
-		eprefixify "${T}"/fontconfig.properties
-		insinto "${dest}"/jre/lib/
-		doins "${T}"/fontconfig.properties
-	fi
-
-	# This needs to be done before CDS - #215225
-	java-vm_set-pax-markings "${ddest}"
-
-	# see bug #207282
-	einfo "Creating the Class Data Sharing archives"
-	case ${ARCH} in
-		arm|ia64)
-			${ddest}/bin/java -client -Xshare:dump || die
-			;;
-		x86)
-			${ddest}/bin/java -client -Xshare:dump || die
-			# limit heap size for large memory on x86 #467518
-			# this is a workaround and shouldn't be needed.
-			${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die
-			;;
-		*)
-			${ddest}/bin/java -server -Xshare:dump || die
-			;;
-	esac
-
-	# Remove empty dirs we might have copied.
-	find "${D}" -type d -empty -exec rmdir -v {} + || die
-
-	if use x64-macos ; then
-		# Fix miscellaneous install_name issues.
-		pushd "${ddest}"/jre/lib > /dev/null || die
-		local lib needed nlib npath
-		for lib in decora_sse glass prism_{common,es2,sw} ; do
-			lib=lib${lib}.dylib
-			einfo "Fixing self-reference of ${lib}"
-			install_name_tool \
-				-id "${EPREFIX}${dest}/jre/lib/${lib}" \
-				"${lib}"
-		done
-		popd > /dev/null
-
-		# This is still jdk1{5,6}, even on Java 8, so don't change it
-		# until you know different.
-		for nlib in jdk1{5,6} ; do
-			install_name_tool -change \
-				/usr/lib/libgcc_s_ppc64.1.dylib \
-				/usr/lib/libSystem.B.dylib \
-				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
-			install_name_tool -id \
-				"${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \
-				"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
-		done
-	fi
-
-	set_java_env
-	java-vm_revdep-mask
-	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
-	java-vm-2_pkg_postinst
-
-	if ! use headless-awt && ! use javafx; then
-		ewarn "You have disabled the javafx flag. Some modern desktop Java applications"
-		ewarn "require this and they may fail with a confusing error message."
-	fi
-}
diff --git a/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild b/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild
index 6f932943387e..ff14aeff436d 100644
--- a/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild
+++ b/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/velocity/dvsl/${PV}/${P}-src.zip -> ${P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RESTRICT="test"
@@ -44,7 +44,7 @@ JAVA_GENTOO_CLASSPATH="
 
 java_prepare() {
 	java-pkg_clean
-	rm -rf test src/test || die
+	rm -rv test src/test || die
 }
 
 src_install() {
diff --git a/dev-java/velocity/files/velocity-1.4-versioned_jar.patch b/dev-java/velocity/files/velocity-1.4-versioned_jar.patch
deleted file mode 100644
index 5b445594058c..000000000000
--- a/dev-java/velocity/files/velocity-1.4-versioned_jar.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ru velocity-1.4/build/build.xml velocity-1.4-gentoo/build/build.xml
---- velocity-1.4/build/build.xml	2004-04-14 08:26:40.000000000 -0400
-+++ velocity-1.4-gentoo/build/build.xml	2005-07-14 21:33:37.000000000 -0400
-@@ -287,7 +287,7 @@
-   <!-- =================================================================== -->
-   <target name="jar" depends="compile">
-          
--    <jar jarfile="${build.dir}/${project}-${version}.jar">
-+    <jar jarfile="${build.dir}/${project}.jar">
- 
-       <fileset dir="${build.dest}">
-         <exclude name="**/package.html"/>
-@@ -324,7 +324,7 @@
-   <!-- =================================================================== -->
-   <target name="jar-J2EE" depends="compile-J2EE" if="J2EE.present">
-         
--    <jar jarfile="${build.dir}/${project}-J2EE-${version}.jar"
-+    <jar jarfile="${build.dir}/${project}-J2EE.jar"
-       basedir="${build.dest}"
-       excludes="**/package.html"
-     />
-@@ -336,7 +336,7 @@
-   <!-- =================================================================== -->
-   <target name="jar-core" depends="compile">
-         
--    <jar compress="true" jarfile="${build.dir}/${project}-core-${version}.jar">
-+    <jar compress="true" jarfile="${build.dir}/${project}-core.jar">
-       <fileset dir="${build.dest}">
-         <exclude name="**/package.html"/>
-         <exclude name="org/apache/oro/**"/>
-@@ -356,7 +356,7 @@
-   <!-- =================================================================== -->
-   <target name="jar-util" depends="compile">
-         
--    <jar jarfile="${build.dir}/${project}-util-${version}.jar">
-+    <jar jarfile="${build.dir}/${project}-util.jar">
-       <fileset dir="${build.dest}">
-         <exclude name="**/package.html"/>
-         <include name="org/apache/velocity/anakia/**"/>
-@@ -373,7 +373,7 @@
-   <!-- =================================================================== -->
-   <target name="jar-servlet" depends="compile">
-         
--    <jar jarfile="${build.dir}/${project}-servlet-${version}.jar">
-+    <jar jarfile="${build.dir}/${project}-servlet.jar">
-       <fileset dir="${build.dest}">
-         <exclude name="**/package.html"/>
-         <include name="org/apache/velocity/servlet/**"/>
diff --git a/dev-java/velocity/velocity-1.7-r1.ebuild b/dev-java/velocity/velocity-1.7-r1.ebuild
deleted file mode 100644
index a288f72936a9..000000000000
--- a/dev-java/velocity/velocity-1.7-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="examples doc source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="A Java-based template engine for easy creation/rendering of documents that format and present data"
-HOMEPAGE="http://velocity.apache.org"
-SRC_URI="mirror://apache/${PN}/engine/${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="test"
-
-CDEPEND="
-	dev-java/commons-collections:0
-	dev-java/commons-lang:2.1
-	dev-java/commons-logging:0
-	dev-java/jdom:0
-	dev-java/log4j:0
-	dev-java/avalon-logkit:2.0
-	dev-java/jakarta-oro:2.0
-	java-virtuals/servlet-api:2.3
-	dev-java/werken-xpath:0
-	dev-java/ant-core:0
-"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.4
-	test? (
-		dev-java/ant-junit:0
-		dev-java/ant-antlr:0
-		dev-db/hsqldb:0
-	)
-"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.4"
-
-JAVA_PKG_FILTER_COMPILER="jikes"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_GENTOO_CLASSPATH="
-	commons-collections
-	commons-lang-2.1
-	commons-logging
-	jdom
-	log4j
-	avalon-logkit-2.0
-	jakarta-oro-2.0
-	servlet-api-2.3
-	werken-xpath
-	ant-core
-"
-
-# One test fails. see #219668
-RESTRICT="test"
-
-java_prepare() {
-	rm -v *.jar lib/test/*.jar lib/*.jar || die
-}
-
-src_compile () {
-	cd "${S}"/build
-	eant jar -Dskip-download=true #prebuilt javadocs
-}
-
-src_test() {
-	mkdir -p bin/test-lib || die
-	cd bin/test-lib || die
-	java-pkg_jar-from junit,hsqldb
-	java-pkg_jar-from --virtual servlet-api-2.3
-	cd "${S}"/build
-	ANT_TASKS="ant-junit ant-antlr" eant test -Dskip-download=true
-}
-
-src_install () {
-	java-pkg_newjar bin/*.jar
-
-	dodoc NOTICE README.txt
-	# has other stuff besides api too
-	use doc && java-pkg_dohtml -r docs/*
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/velocity/velocity-1.7-r2.ebuild b/dev-java/velocity/velocity-1.7-r2.ebuild
index bd3f8f37a088..67dc9a5a6ff9 100644
--- a/dev-java/velocity/velocity-1.7-r2.ebuild
+++ b/dev-java/velocity/velocity-1.7-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/${PN}/engine/${PV}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 CDEPEND="
@@ -58,7 +58,7 @@ S="${WORKDIR}/${P}"
 
 java_prepare() {
 	java-pkg_clean
-	rm -rf test src/test || die
+	rm -rv test src/test || die
 }
 
 src_install() {
diff --git a/dev-java/velocity/velocity-1.7.ebuild b/dev-java/velocity/velocity-1.7.ebuild
deleted file mode 100644
index 65a0d3d623f0..000000000000
--- a/dev-java/velocity/velocity-1.7.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="examples doc source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="A Java-based template engine for easy creation/rendering of documents that format and present data"
-HOMEPAGE="http://velocity.apache.org"
-SRC_URI="mirror://apache/${PN}/engine/${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="test"
-
-CDEPEND="
-	dev-java/commons-collections:0
-	dev-java/commons-lang:2.1
-	dev-java/commons-logging:0
-	dev-java/jdom:1.0
-	dev-java/log4j:0
-	dev-java/avalon-logkit:2.0
-	dev-java/jakarta-oro:2.0
-	java-virtuals/servlet-api:2.3
-	dev-java/werken-xpath:0
-	dev-java/ant-core:0
-"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.4
-	test? (
-		dev-java/ant-junit:0
-		dev-java/ant-antlr:0
-		dev-db/hsqldb:0
-	)
-"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.4"
-
-JAVA_PKG_FILTER_COMPILER="jikes"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_GENTOO_CLASSPATH="
-	commons-collections
-	commons-lang-2.1
-	commons-logging
-	jdom-1.0
-	log4j
-	avalon-logkit-2.0
-	jakarta-oro-2.0
-	servlet-api-2.3
-	werken-xpath
-	ant-core
-"
-
-# One test fails. see #219668
-RESTRICT="test"
-
-java_prepare() {
-	rm -v *.jar lib/test/*.jar lib/*.jar || die
-}
-
-src_compile () {
-	cd "${S}"/build
-	eant jar -Dskip-download=true #prebuilt javadocs
-}
-
-src_test() {
-	mkdir -p bin/test-lib || die
-	cd bin/test-lib || die
-	java-pkg_jar-from junit,hsqldb
-	java-pkg_jar-from --virtual servlet-api-2.3
-	cd "${S}"/build
-	ANT_TASKS="ant-junit ant-antlr" eant test -Dskip-download=true
-}
-
-src_install () {
-	java-pkg_newjar bin/*.jar
-
-	dodoc NOTICE README.txt
-	# has other stuff besides api too
-	use doc && java-pkg_dohtml -r docs/*
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-lang/rebol-bin/Manifest b/dev-lang/rebol-bin/Manifest
index 1e6e7f9b407c..96fb3aab382e 100644
--- a/dev-lang/rebol-bin/Manifest
+++ b/dev-lang/rebol-bin/Manifest
@@ -1 +1,3 @@
 DIST r3-a111-4-4.tar.gz 269516 SHA256 421c84f86b4649eaccaffe69c3a2b1bd856929e63711eea81da49d10bcdc05a4 SHA512 060b01197c242ceda20fe84228a5ae7d2a329eac04549ad5e0f368bc91baea515143e541ed9815a14aba9b3d571a22ff0d643716dc21452d5aeeb7678938455e WHIRLPOOL e3bb2de479e3620a6209c7e7dd245b9725422f7eb8bd3fc1db588d28dd605f2f19e5bf9f3ceec0a9f9978e360f02d59f6b781ed5f633eca17ea1656eae8292cb
+DIST r3-g25033f8 553424 SHA256 9a7ae292bbecdd4fcc6246035c837668b5cb1725375ec5534774612496f305b9 SHA512 8376e0d6e708777539f9639d5c78120aa02e7364d269435bec6ef6b0527e8321e0135ea1cb005246cb7e3387cf5c941864933e21c21fb3f0e322f5c8ea118ec3 WHIRLPOOL 613f7343c9fc0c5e176ef1e3051a4e3721856483fa23ec6d5fec344382355ddc7dd7226a0facf430bd25c268efa32f9074598206c22314e6bcb20ef72cd66017
+DIST r3-linux-x64-gbf237fc 563560 SHA256 3ddb6e7d90fda9623676f7bc0dfc28e373e047e9c73c7c8df77b314aec34a832 SHA512 e984a10c59aa66a081dd8aee8ad7376cc50c600211167468b8fb9b461481b7e8df50b974de931d5c6ce31df3f70dd108f9e890daeb759da525ea81ebf9c5dc35 WHIRLPOOL 1a1274294194ddd9d9235b4876038e3f2a286e1f932cb40793b778f63012429ebcb353f978f116dbb45079c494e50e8cdfca3f6a980a27ce479111bc7e5c5856
diff --git a/dev-lang/rebol-bin/metadata.xml b/dev-lang/rebol-bin/metadata.xml
index 40aa45df2b01..63a5751de4a5 100644
--- a/dev-lang/rebol-bin/metadata.xml
+++ b/dev-lang/rebol-bin/metadata.xml
@@ -5,4 +5,8 @@
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-lang/rebol-bin/rebol-bin-3_pre111.ebuild b/dev-lang/rebol-bin/rebol-bin-3_pre111.ebuild
index 17b0896d300c..0ff5cc632bc0 100644
--- a/dev-lang/rebol-bin/rebol-bin-3_pre111.ebuild
+++ b/dev-lang/rebol-bin/rebol-bin-3_pre111.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,10 +22,10 @@ QA_PRESTRIPPED="opt/rebol/r3"
 S=${WORKDIR}
 
 src_compile() {
-	:;
+	:
 }
 
 src_install() {
 	mkdir -p "${D}/opt/rebol/"
-	cp "${S}/r3" "${D}/opt/rebol/" 					|| die "Failed to install"
+	cp "${S}/r3" "${D}/opt/rebol/" || die "Failed to install"
 }
diff --git a/dev-lang/rebol-bin/rebol-bin-3_pre20140304.ebuild b/dev-lang/rebol-bin/rebol-bin-3_pre20140304.ebuild
new file mode 100644
index 000000000000..cbcaa5568381
--- /dev/null
+++ b/dev-lang/rebol-bin/rebol-bin-3_pre20140304.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+DESCRIPTION="Relative Expression-Based Object Language"
+HOMEPAGE="http://rebol.com"
+
+# download links are from
+#    http://rebolsource.net/
+# amd64 is of experimental build
+git_commit=25033f8
+SRC_URI="
+	amd64? ( http://rebolsource.net/downloads/experimental/r3-linux-x64-gbf237fc )
+	x86? (   http://rebolsource.net/downloads/linux-x86/r3-g${git_commit} )
+"
+
+# sourcecode uses this license:
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+QA_PREBUILT="opt/rebol/r3"
+
+S=${WORKDIR}
+
+src_unpack() {
+	mkdir -p "${S}"
+	cp "${DISTDIR}/${A}" "${S}"/r3 || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	exeinto /opt/rebol
+	doexe r3
+}
diff --git a/dev-libs/hyphen/hyphen-2.8.6.ebuild b/dev-libs/hyphen/hyphen-2.8.6.ebuild
index 930c4cc6c0c4..f1a525c2a092 100644
--- a/dev-libs/hyphen/hyphen-2.8.6.ebuild
+++ b/dev-libs/hyphen/hyphen-2.8.6.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 
 DESCRIPTION="ALTLinux hyphenation library"
-HOMEPAGE="http://hunspell.sf.net"
+HOMEPAGE="http://hunspell.github.io/"
 SRC_URI="mirror://sourceforge/hunspell/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
diff --git a/dev-libs/hyphen/hyphen-2.8.8.ebuild b/dev-libs/hyphen/hyphen-2.8.8.ebuild
index d72f860d184f..6fadff3e9ea6 100644
--- a/dev-libs/hyphen/hyphen-2.8.8.ebuild
+++ b/dev-libs/hyphen/hyphen-2.8.8.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=6
 
 DESCRIPTION="ALTLinux hyphenation library"
-HOMEPAGE="http://hunspell.sf.net"
+HOMEPAGE="http://hunspell.github.io/"
 SRC_URI="mirror://sourceforge/hunspell/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
@@ -18,7 +18,7 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 "
 
-DOCS="AUTHORS ChangeLog NEWS README* THANKS TODO"
+DOCS=( AUTHORS ChangeLog NEWS README{,_hyph_en_US.txt,.nonstandard,.hyphen,.compound} THANKS TODO )
 
 src_configure() {
 	econf $(use_enable static-libs static)
diff --git a/dev-perl/Context-Preserve/Context-Preserve-0.10.0-r1.ebuild b/dev-perl/Context-Preserve/Context-Preserve-0.10.0-r1.ebuild
index 7f848c5a9055..2727507b5a31 100644
--- a/dev-perl/Context-Preserve/Context-Preserve-0.10.0-r1.ebuild
+++ b/dev-perl/Context-Preserve/Context-Preserve-0.10.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -8,7 +8,7 @@ MODULE_AUTHOR=JROCKWAY
 MODULE_VERSION=0.01
 inherit perl-module
 
-DESCRIPTION="Pass chained return values from subs, modifying their values, without losing context"
+DESCRIPTION="Return chained, modified values from subs, without losing context"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc-aix ~x86-solaris"
@@ -18,7 +18,7 @@ RDEPEND=""
 DEPEND="${RDEPEND}
 	test? (
 		dev-perl/Test-Exception
-		|| ( >=virtual/perl-Test-Simple-1.1.10 dev-perl/Test-use-ok )
+		>=virtual/perl-Test-Simple-1.1.10
 	)"
 
 SRC_TEST="do"
diff --git a/dev-perl/DBICx-TestDatabase/DBICx-TestDatabase-0.40.0.ebuild b/dev-perl/DBICx-TestDatabase/DBICx-TestDatabase-0.40.0.ebuild
index 05e9f73719c1..c5028555bc37 100644
--- a/dev-perl/DBICx-TestDatabase/DBICx-TestDatabase-0.40.0.ebuild
+++ b/dev-perl/DBICx-TestDatabase/DBICx-TestDatabase-0.40.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,7 +22,7 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-perl/DBIx-Class
 		virtual/perl-Test-Simple
-		|| ( >=virtual/perl-Test-Simple-1.1.10 dev-perl/Test-use-ok )
+		>=virtual/perl-Test-Simple-1.1.10
 	)
 "
 
diff --git a/dev-perl/Devel-ArgNames/Devel-ArgNames-0.30.0-r1.ebuild b/dev-perl/Devel-ArgNames/Devel-ArgNames-0.30.0-r1.ebuild
index 432ac18db62c..5907c36ffa14 100644
--- a/dev-perl/Devel-ArgNames/Devel-ArgNames-0.30.0-r1.ebuild
+++ b/dev-perl/Devel-ArgNames/Devel-ArgNames-0.30.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,7 @@ IUSE="test"
 RDEPEND="dev-perl/PadWalker"
 DEPEND="${RDEPEND}
 	test? (
-		|| ( >=virtual/perl-Test-Simple-1.1.10 dev-perl/Test-use-ok )
+		>=virtual/perl-Test-Simple-1.1.10
 	)
 "
 
diff --git a/dev-perl/IO-Handle-Util/IO-Handle-Util-0.10.0.ebuild b/dev-perl/IO-Handle-Util/IO-Handle-Util-0.10.0.ebuild
index 89a2d5b899e5..4f27943d51c6 100644
--- a/dev-perl/IO-Handle-Util/IO-Handle-Util-0.10.0.ebuild
+++ b/dev-perl/IO-Handle-Util/IO-Handle-Util-0.10.0.ebuild
@@ -23,10 +23,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
 	test? (
-		>=virtual/perl-Test-Simple-0.880.0
-		|| (
-			>=virtual/perl-Test-Simple-1.1.10
-			( <virtual/perl-Test-Simple-1.1.10 dev-perl/Test-use-ok )
-		)
+		>=virtual/perl-Test-Simple-1.1.10
 	)
 "
diff --git a/dev-perl/MooseX-Types-DateTime-ButMaintained/MooseX-Types-DateTime-ButMaintained-0.160.0.ebuild b/dev-perl/MooseX-Types-DateTime-ButMaintained/MooseX-Types-DateTime-ButMaintained-0.160.0.ebuild
index bbfc52c59344..34da40ecad2d 100644
--- a/dev-perl/MooseX-Types-DateTime-ButMaintained/MooseX-Types-DateTime-ButMaintained-0.160.0.ebuild
+++ b/dev-perl/MooseX-Types-DateTime-ButMaintained/MooseX-Types-DateTime-ButMaintained-0.160.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -30,7 +30,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? (
 		>=dev-perl/Test-Exception-0.27
-		|| ( >=virtual/perl-Test-Simple-1.1.10 >=dev-perl/Test-use-ok-0.02 )
+		>=virtual/perl-Test-Simple-1.1.10
 		>=dev-perl/Time-Duration-Parse-0.06
 	)"
 
diff --git a/dev-perl/MooseX-Types-DateTime-MoreCoercions/MooseX-Types-DateTime-MoreCoercions-0.150.0.ebuild b/dev-perl/MooseX-Types-DateTime-MoreCoercions/MooseX-Types-DateTime-MoreCoercions-0.150.0.ebuild
index e2e1e6691121..31361bbd9f1c 100644
--- a/dev-perl/MooseX-Types-DateTime-MoreCoercions/MooseX-Types-DateTime-MoreCoercions-0.150.0.ebuild
+++ b/dev-perl/MooseX-Types-DateTime-MoreCoercions/MooseX-Types-DateTime-MoreCoercions-0.150.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -30,6 +30,6 @@ DEPEND="${RDEPEND}
 		virtual/perl-ExtUtils-MakeMaker
 		virtual/perl-File-Spec
 		dev-perl/Test-Fatal
-		|| ( >=virtual/perl-Test-Simple-1.1.10 >=dev-perl/Test-use-ok-0.20.0 )
+		>=virtual/perl-Test-Simple-1.1.10
 	)
 "
diff --git a/dev-perl/MooseX-Types-DateTime/MooseX-Types-DateTime-0.130.0.ebuild b/dev-perl/MooseX-Types-DateTime/MooseX-Types-DateTime-0.130.0.ebuild
index da5a5ad42f96..eb788e0873d5 100644
--- a/dev-perl/MooseX-Types-DateTime/MooseX-Types-DateTime-0.130.0.ebuild
+++ b/dev-perl/MooseX-Types-DateTime/MooseX-Types-DateTime-0.130.0.ebuild
@@ -30,9 +30,5 @@ DEPEND="${RDEPEND}
 		virtual/perl-File-Spec
 		virtual/perl-Locale-Maketext
 		dev-perl/Test-Fatal
-		>=virtual/perl-Test-Simple-0.880.0
-		|| (
-			>=virtual/perl-Test-Simple-1.1.10
-			( <virtual/perl-Test-Simple-1.1.10 >=dev-perl/Test-use-ok-0.20.0 )
-		)
+		>=virtual/perl-Test-Simple-1.1.10
 	)"
diff --git a/dev-perl/MooseX-Types-DateTimeX/MooseX-Types-DateTimeX-0.100.0.ebuild b/dev-perl/MooseX-Types-DateTimeX/MooseX-Types-DateTimeX-0.100.0.ebuild
index 79b40dde87f6..a07b943d1a78 100644
--- a/dev-perl/MooseX-Types-DateTimeX/MooseX-Types-DateTimeX-0.100.0.ebuild
+++ b/dev-perl/MooseX-Types-DateTimeX/MooseX-Types-DateTimeX-0.100.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -25,9 +25,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=virtual/perl-ExtUtils-MakeMaker-6.420.0
 	test? (
-		|| ( >=virtual/perl-Test-Simple-1.1.10 >=dev-perl/Test-use-ok-0.20.0 )
+		>=virtual/perl-Test-Simple-1.1.10
 		>=dev-perl/Test-Exception-0.270.0
-		virtual/perl-Test-Simple
 	)
 "
 
diff --git a/dev-perl/Tie-ToObject/Tie-ToObject-0.30.0-r1.ebuild b/dev-perl/Tie-ToObject/Tie-ToObject-0.30.0-r1.ebuild
index af1b48b34b48..06fc718ffe21 100644
--- a/dev-perl/Tie-ToObject/Tie-ToObject-0.30.0-r1.ebuild
+++ b/dev-perl/Tie-ToObject/Tie-ToObject-0.30.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,6 +15,6 @@ KEYWORDS="~amd64 ~x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND=""
-DEPEND="test? ( || ( >=virtual/perl-Test-Simple-1.1.10 dev-perl/Test-use-ok ) )"
+DEPEND="test? ( >=virtual/perl-Test-Simple-1.1.10 )"
 
 SRC_TEST=do
diff --git a/dev-php/adodb/Manifest b/dev-php/adodb/Manifest
index 670aa4bf959d..676c50393007 100644
--- a/dev-php/adodb/Manifest
+++ b/dev-php/adodb/Manifest
@@ -1 +1,2 @@
 DIST adodb518a.tgz 544455 SHA256 3814dbd776ec5416f9a03eb4eecb081844b0166240dd539439cf27c79efb4d5e SHA512 d561a5143e903195a2c87e637b33c9767f62148d7466fa6cb84d3bc86e5b303c0bf0f04cf370db4b81d9ac7ef8b3f2f28af9e5f28d0956706f59a74367898c53 WHIRLPOOL 3c972f937afd76f5a4595bcee7cb3355a52a2d596615c2f7c3232d472e3b838b72547a4d5216c489f62d02fd3d96b6672b7d044aa2c39fa707f940469ea35554
+DIST v5.20.4.tar.gz 460807 SHA256 d0b15821d8fc77be2753938afc1e99d0b1f5b8f3dc1c7ab01061d8d0cbd4f394 SHA512 f635297681236fdf4e7ea84d5eb5c2760aba663c2f443052e6d25bb96d32179b4cb21de4a880d6cb9100941e2dc9eff5ef2655e57a9b2879e459cb1c9af7b7a6 WHIRLPOOL e8c14b06caa9143d971c3bc077a15d0d83dbea6167f5c2bb50dff066676c5a16b972a59131ce665b5cb6f5c3c0c8db1c3fa6fc2a5c32717cd347d4d24f52a96c
diff --git a/dev-php/adodb/adodb-5.20.4.ebuild b/dev-php/adodb/adodb-5.20.4.ebuild
new file mode 100644
index 000000000000..465db3f9f992
--- /dev/null
+++ b/dev-php/adodb/adodb-5.20.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_PN="ADOdb"
+DESCRIPTION="Database abstraction layer for PHP"
+HOMEPAGE="http://www.adodb.org/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz"
+
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+# If you want to be picky, we should require that PHP be built with at
+# least one database driver enabled; otherwise adodb isn't going to be
+# able to do anything. But, the database USE flags for dev-lang/php are
+# a mess. What we would *like* to do is have a set of USE flags for
+# adodb that then propagate to PHP itself... for example, adodb[mysql]
+# could require php[mysql]. To do that would require that we duplicate
+# the database USE flag mess for adodb -- not desirable. Instead we punt
+# and let the user install adodb unconditionally. If he doesn't have
+# database support in PHP, it just won't work.
+RDEPEND="dev-lang/php:*"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	DOCS="README.md docs/changelog*.md xmlschema*.dtd session/*.sql"
+	DOCS+=" session/*.txt session/*.xml pear/auth_adodb_example.php"
+	DOCS+=" pear/readme.Auth.txt"
+
+	dodoc $DOCS
+	rm -f $DOCS || die "failed to remove docs before installation"
+
+	insinto "/usr/share/php/${PN}"
+	doins *.php
+	doins -r contrib datadict drivers lang pear perf replicate session xsl
+}
diff --git a/dev-php/adodb/metadata.xml b/dev-php/adodb/metadata.xml
index 68b4b1ff7287..7598d63eede1 100644
--- a/dev-php/adodb/metadata.xml
+++ b/dev-php/adodb/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">adodb</remote-id>
+		<remote-id type="github">ADOdb</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 39a8899210b5..305a08a70cd5 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,4 +1,4 @@
 DIST botocore-1.3.22.tar.gz 2349601 SHA256 02a6d320b09179bc5dcbafd4be732d9431bfebf5bed6d6b6508eca96b599a399 SHA512 7b349a78c83051a29993ce00a11ecfa4734425c3ed27ce3e405140e19017b5c670d857ea489ea1f6f3ec767b3e4704547565b2ec67f5d7001a0cc30ff2a39de7 WHIRLPOOL 98c5e7488c6d1fe5c3e3484c770f8b346508359c5d174e5660f10ea62b054f442e3d15cc716ddd5acc42f1af0a10463c1923de138338175f1dcba9ced283c8ee
-DIST botocore-1.4.27.tar.gz 2502287 SHA256 1d18565c45ab1eeb7e5e237c7aa1ce81b6376fa63e5a9d948c5bcdfb5fe27d75 SHA512 2ce94ed553ac513db0000201620f5bb8d8af85104d2ab7b2d8d23a50ca4d01bd2c5eccae8172f379a749ca80dcb827c430412ef6ae7d73f0a2022e6119d71dc5 WHIRLPOOL 2bb20b63b38dba3c3ff28e2e5b2d927897c6ef56a4828ac496d5e3397512a7786336c7026c1c11786db8abcb93afdebe2e429c0eee3371d2041d7bc568b192e8
 DIST botocore-1.4.28.tar.gz 2503928 SHA256 145e41531a5d38862974ddf45c055e1561046f72caa04564f0435d25cf62dbe1 SHA512 51feb906bc82c66054d0b4b09041377c67839cfbe9dcf39975060b3c1acb9d8e5607fb43e93199d321ab890410550de7f7812598aeecad6709ce1317a19a3bc6 WHIRLPOOL d089d9d5a038cb8253d7a4194d66972e1ac1a0ddb92d90e3bf8a48de9c87a74ddbccef7eebe475f778ad03d6a7102c38d1905016600d51848bcef9c584136821
 DIST botocore-1.4.31.tar.gz 2622913 SHA256 c526e5f160f1d244c014bf59d013d4a3ba6037e62826ef9ab6c01bbb2a5ef013 SHA512 395de78cc39fed1e89f913e55e8d2f64b05b5e459831e3f46e7c88f4b13f6291cab252dc650137d994abfb3b4f5afdad939c175214588e668971c8b180e8310b WHIRLPOOL cdfa6c9a7d0a16e1e464db9ea678fe4374211a4d65e0e4de539228c35dc3269527df0095effa666c6414293902b172299f592264652dc2ef32c264afaade52e7
+DIST botocore-1.4.34.tar.gz 2630600 SHA256 a649ab5f9d9ddaa235510f62939e874aa3e37677564319883337ef9e98b7e5a1 SHA512 e683bf6881f9339a7431a085be274124e362a1b8ab538ae0589f7c266b160078e991ac27b2e5e5321c26f008ab548298abb382bd2d5b927866263b60ba67bb8d WHIRLPOOL 8f2d5e1c729cdbfeea29c416fc114e2c3ef10c9f09aa4098176547e7c7b54e7e2dbd0818f1147f13532f375da96943e4f4f5886c1d2809910c8527493937d956
diff --git a/dev-python/botocore/botocore-1.4.27.ebuild b/dev-python/botocore/botocore-1.4.34.ebuild
similarity index 100%
rename from dev-python/botocore/botocore-1.4.27.ebuild
rename to dev-python/botocore/botocore-1.4.34.ebuild
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 7844c34b3d60..052c79b4dfbf 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,4 +1,4 @@
 DIST docker-py-1.2.2.tar.gz 69685 SHA256 85284a5b1a965e01a5d0a91f9f639ad5069143a276c123198fdafc3659280b38 SHA512 bf00b19e0ab56e5c0e8459234d09722ca504ecd933bfba61cb4ab4805410f53f6ad6083f2e964ef5a6eded2ea05aa01a89c27621064386bae145c7258ed996ad WHIRLPOOL bd7ff4579f924e02d18581b1aca00790dcb84afda03e4cde70b349bfdb4ad43aa2e06da2bcbe780f6074d98f9af9b14fb9d2ab4da9265e56b73288902c9ede7a
 DIST docker-py-1.8.0.tar.gz 102575 SHA256 6a2feb4dad94ff01401af1bd1455ca20505af4bb5439f1c80114020461c4cf58 SHA512 60ac793d3061aec4fe46c694a00207560138895c7c6299a6734f2413601648da5130db00dbf33f41c3a91a717d825b9d1ce76413df2ae433b30a61eead373b39 WHIRLPOOL e5e204e7754fe5b038ef218718063892661636bd4ce51a160479725562865076ae2a3c99c38721b7c4f184ba45390f4c5a28582b83311af81da67867cf05a643
-DIST docker-py-1.8.0_rc2.tar.gz 100120 SHA256 5176c543343a582f2f7a461560a7c759d002b2dceb7552f542d7d1e0fce3cb05 SHA512 f7924015bc267acb095a9f21d151afd56d787a5d26dcc8c285d81c4e5af8a1027c7f166b8178e3e821a3b2fe541b51121c825ab59591b97bea8eb8a3fe3d7a0f WHIRLPOOL 451fea912c3cdd6bcaf7e29431719c39d7fea9bb03b7b94fbecf493bc28713d97e1438ee6ce8c0fb6977739061c25a87b29e5924e087e8613fe1f115b8000809
 DIST docker-py-1.8.1.tar.gz 101171 SHA256 82dc8db8088576ec5c42c203f7c46a88a26963e137ee0dafbf7e33882d75eb47 SHA512 c05412a43a774cc402e8f1bbb6c389c17e7fc335db4cfbe2d8a7001d7389f74fe51b3a2120bbbde640d93c5788283651b992389e3a09852eecb10e87e13466a0 WHIRLPOOL 47bdb88c07385d98cf5922ee420f85a93a84c62cc807acd9b0093ce55c386a4bd9f3cca1603e00259d32b0c3f0617282c49f23e4f67ead803a1ea5850ddeafc3
+DIST docker-py-1.9.0_rc2.tar.gz 105689 SHA256 30770466eef8fe5db3ac75ede506bb412de8a59600954089b385b4d134d54051 SHA512 8c4993aea477ae640660d10f80ca0a9b5f40f1d7a446cc67d392b824c78272ee32d42004952a70a3a55a105f313c06338266b206f4193cab736fa84c3c9b4d8c WHIRLPOOL bf1329f20095d519756a68bc3bd2a95d6d476366e1cfdc38eb38a6ad4a25da11964a20d039fb32af69dd4bd76b578b43b3b6b468767ba2fc8305b088019ae17c
diff --git a/dev-python/docker-py/docker-py-1.8.0_rc2.ebuild b/dev-python/docker-py/docker-py-1.9.0_rc2.ebuild
similarity index 84%
rename from dev-python/docker-py/docker-py-1.8.0_rc2.ebuild
rename to dev-python/docker-py/docker-py-1.9.0_rc2.ebuild
index 155e9614162c..2c9b49851024 100644
--- a/dev-python/docker-py/docker-py-1.8.0_rc2.ebuild
+++ b/dev-python/docker-py/docker-py-1.9.0_rc2.ebuild
@@ -31,6 +31,8 @@ RDEPEND="
 	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_3' 'python3_4' )
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
 "
 
 python_compile_all() {
diff --git a/dev-python/nose2/Manifest b/dev-python/nose2/Manifest
index 50f33d19036a..ed86fec5707a 100644
--- a/dev-python/nose2/Manifest
+++ b/dev-python/nose2/Manifest
@@ -1 +1,2 @@
 DIST nose2-0.6.4.tar.gz 134636 SHA256 56831c4caa47e2939f555b33e2c44170c1fab4d13526af838d9d80bef9e091b6 SHA512 4161231ecf195a3c5172f8bea2002f9cf4d55ee4f976f512b1ae758ebe8389f41520594da7ad2b21cfbf998be388993281e126363d24ee00c948d6c57278333a WHIRLPOOL 2905a358ec07d67ff64882f73527044a6bfbd70cb11865ee274b91675c3939b7b018d8dceb667396afae9ed425c14bd6ae3317d97fc2e35931302e6965054c6f
+DIST nose2-0.6.5.tar.gz 134808 SHA256 13c00fd49fe2057688a68860f5de195e50ec85748f102346c74e7692b36d2c23 SHA512 fc84aa19d486ff1441dd43666182212e4a05b3be054f3c8967e36e624c08ee6eb10b01bba45b5f5dbbd38cfd057d53877e0bc0d9aba59b842688a5d4ec944b40 WHIRLPOOL b08589fe1b1467d11f31b702f6dad4c2212e7a47f370138a110ee109d0c078a38a137ef0b21afc6d8e718074c662d28ded8ce19423df4357ade771af3238d229
diff --git a/dev-python/nose2/nose2-0.6.5.ebuild b/dev-python/nose2/nose2-0.6.5.ebuild
new file mode 100644
index 000000000000..f83b33e63e77
--- /dev/null
+++ b/dev-python/nose2/nose2-0.6.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="nose2 is the next generation of nicer testing for Python"
+HOMEPAGE="https://github.com/nose-devs/nose2"
+SRC_URI="https://github.com/nose-devs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+CDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.1[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${CDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.5[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/cov-core-1.12[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" -m nose2.__main__ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-zipstream/Manifest b/dev-python/python-zipstream/Manifest
new file mode 100644
index 000000000000..414ab7a6c12f
--- /dev/null
+++ b/dev-python/python-zipstream/Manifest
@@ -0,0 +1 @@
+DIST python-zipstream-1.1.4.tar.gz 21376 SHA256 32a7a4bdb786914445589595273beffbbf9b6a0a3a3dc2cf19ea96114bd2abd7 SHA512 722c1d7db91dc47064fc51f1182417f46923b8f42a56e854f1fa125eaccfc7f86d3deab71709226a798a1caf5a84a8a7fa7d3564065ab91afbad434ed787ce32 WHIRLPOOL 153e6797cb88bcd1115f8678022061008073f0a33a309b9180e699273940956062ea1c69dd83b6a6a5f4b417405933670949ff09179beb59482866f340af1fd5
diff --git a/dev-python/python-zipstream/metadata.xml b/dev-python/python-zipstream/metadata.xml
new file mode 100644
index 000000000000..061032f77148
--- /dev/null
+++ b/dev-python/python-zipstream/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bman@gentoo.org</email>
+		<name>Aaron Bauman</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">allanlei/python-zipstream</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-zipstream/python-zipstream-1.1.4.ebuild b/dev-python/python-zipstream/python-zipstream-1.1.4.ebuild
new file mode 100644
index 000000000000..f14c80904853
--- /dev/null
+++ b/dev-python/python-zipstream/python-zipstream-1.1.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A zip archive generator"
+HOMEPAGE="https://github.com/allanlei/python-zipstream"
+SRC_URI="https://github.com/allanlei/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+python_test() {
+	nosetests || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/setproctitle/setproctitle-1.1.8.ebuild b/dev-python/setproctitle/setproctitle-1.1.8.ebuild
index b028123889dd..fa00e72ebd36 100644
--- a/dev-python/setproctitle/setproctitle-1.1.8.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
 inherit distutils-r1 toolchain-funcs
 
 DESCRIPTION="Allow customization of the process title"
-HOMEPAGE="https://code.google.com/p/py-setproctitle/ https://pypi.python.org/pypi/setproctitle"
+HOMEPAGE="https://github.com/dvarrazzo/py-setproctitle"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/setproctitle/setproctitle-1.1.9.ebuild b/dev-python/setproctitle/setproctitle-1.1.9.ebuild
index e09507e56968..a2dc4344de48 100644
--- a/dev-python/setproctitle/setproctitle-1.1.9.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
 inherit distutils-r1 toolchain-funcs
 
 DESCRIPTION="Allow customization of the process title"
-HOMEPAGE="https://code.google.com/p/py-setproctitle/ https://pypi.python.org/pypi/setproctitle"
+HOMEPAGE="https://github.com/dvarrazzo/py-setproctitle"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -32,7 +32,7 @@ python_compile_all() {
 }
 
 python_test() {
-		# The suite via the Makefile appears to not cater to pypy
+	# The suite via the Makefile appears to not cater to pypy
 	[[ ${EPYTHON} =~ pypy ]] && return
 
 	# prepare embedded executable
diff --git a/dev-python/stormpath/Manifest b/dev-python/stormpath/Manifest
index d6b7e32e6031..d2a240148314 100644
--- a/dev-python/stormpath/Manifest
+++ b/dev-python/stormpath/Manifest
@@ -1,3 +1,3 @@
-DIST stormpath-2.1.6.tar.gz 4339678 SHA256 47649cf8edaf5ef48346f74558e62e0aaf28fb49bd7e3db99db9338739913d77 SHA512 2cc6ecd674ca6b5fcfbb6664f863cb4c6378748eb5ca2ceb5e0db3ac46c567a4b62a1bb595044b15c0294b5abe471c9ac675b93db49e5d2e146cd8954c8c7611 WHIRLPOOL c15085c2a1e5600ff93bc1e013439270c17472035a39fde52f31e21971b5508b4ff50a9a5f1472aa185282fefbfc9015a88eed0b5c641acf787abfaf9f72e06b
 DIST stormpath-2.3.1.tar.gz 4346382 SHA256 cf7e2e0784d62a1992b7708232a4af6a444a10523cb9f9e2893530d6b4cee8d0 SHA512 1e6308e45f41ff2094740063e8b2fc4dcb197bfa1fe617c89f95326410191670621defa7f8158b8dcc07b0e7a79a831c81cc9df22334c29d9f832691315076a9 WHIRLPOOL 91c17a5ed72679ba46c2311f6fec6f6fdd25209959bd8e58960289aef259ad7f8ff9335b668aeec471463b91fa8f6f6acf37a8f65870f3ab3c41d8af52a10c70
 DIST stormpath-2.4.0.tar.gz 4345415 SHA256 4c3ee97bf630f0fb9237bccedfd4c41997a47599d76d319cfb84e95d7ec26db6 SHA512 4086c03b745427fa59d6b3739da38822781587d9d55bb0ea142dc70b9dd38ca98e8fdfbb167af6944440e7241ba63b2a2f58130b48789998fa3e263f11326a2b WHIRLPOOL 3425301a9c1858f5a602196be53e7a61961922786356f54f9fa3f033bb1b6460ad9ff32e4e0f2252e8b8220bd129fae5b8613771466f015e797b86d263391000
+DIST stormpath-2.4.1.tar.gz 4345634 SHA256 5c07c27ff08527920878e7a350bd6532198e066badf929d70d46937684399e64 SHA512 50fbe12015b3dcc70c13de65d0a594684bb605f24f3aaf60bb51b7ff9e01346e6dece994ebccf790e58fe66c90aad252c4ef4c33b24f1b98172e1634fb733b95 WHIRLPOOL 332080e7c6c2ec7535e8eb51e132ac3df7f18fc65565e25b769f25cd5cd7d65c4b1d28da0c2b186250d8b58b6618bb5b27ccd1c1e6148365ad1139c7d5d39f4f
diff --git a/dev-python/stormpath/stormpath-2.1.6.ebuild b/dev-python/stormpath/stormpath-2.4.1.ebuild
similarity index 96%
rename from dev-python/stormpath/stormpath-2.1.6.ebuild
rename to dev-python/stormpath/stormpath-2.4.1.ebuild
index e6bdfe5b1541..8248d4ff13f6 100644
--- a/dev-python/stormpath/stormpath-2.1.6.ebuild
+++ b/dev-python/stormpath/stormpath-2.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index df547172c330..f80815cae325 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -5,21 +5,21 @@ DIST git-2.7.3-00-9831e92bfa833ee9c0ce464bbc2f941ae6c2698d-lose-name-path.patch
 DIST git-2.7.3.tar.xz 3909636 SHA256 89c467912d4740da2b40288f956251f0a1e276e28eecd28a6d776067103629b6 SHA512 f7acbf52d12f39d323bd90a82c7135aa2aacf2661f7087c71b41dbfbec688342e0a2fc061fc0f216848a538a0dbc4fce68e24ea2a26e747f5eb92f763fa5bc72 WHIRLPOOL 5cc261749f91c2e0b0509d2fac1bc7426b3ddcc37e859d4f524838e1dd471071ad430886751933bae57aafc20bdcf3f9a43f4c018cc9c89610134a5203b22447
 DIST git-2.7.4.tar.xz 3909636 SHA256 dee574defbe05ec7356a0842ddbda51315926f2fa7e39c2539f2c3dcc52e457b SHA512 82a646140834e909bf1748a017e86f37f0711c759fe0a6ad03529beb57c79742cb7bf77c2dba29ccd84fcf3d5f18ad9c85c00f002d3b257be42e058750423da7 WHIRLPOOL 74532038b6ba95a5354f43ebad00a9c159c495d46e7dc1b8a2a59f5a86e149538190d9800144a719dcc00e28cfea1039cd5dbfb67fd5aac5e7d0998d3231bae3
 DIST git-2.8.4.tar.xz 3982836 SHA256 120e9a32a1858871dea34165622ec7a63f27887b93093c8d72a18bcf89fe1657 SHA512 92c3b4437d1160cc23612b4df62646b80a1245d4ed482c3543ba19511f754a34d0185d5dd5d16f2a42bc3097bebc47ece0670c45a1c53ca38cbfbff7d43de87b WHIRLPOOL 8be86b1cba51ef549d56014c090dd5844019c2c5ccf15865dce86ed7f28f5628621450d784f23ba03f79282bc87e5a8ee0fad161a157785cf6c5716f8aa1e767
-DIST git-2.9.0.tar.xz 4014000 SHA256 f41fa97949948fbf49af94a43d779e072a5452c6b5039d86ffa41ebab747b409 SHA512 9433b4642482634d4c76884307d987155568c08a741285cff0eb3699de04d7ff970892f23587bdf6f9ea0083dd5aee652c3265842ba6cf789955e0040a3e5b6a WHIRLPOOL 314fc79cb5b480da7ad6abc4ba467cc9e806f95c45dc527cd31d481547d446612936f1601ac31c9296a371a57f1403f8452cc7487816fd1c8e85c7bd242ca2a1
 DIST git-2.9.1.tar.xz 4019608 SHA256 e8fe60bc72c1c979feb43740b3c74fea7f8ffbe7712b71cd9734ddb9c89282a2 SHA512 ff7b8e13f01cfd52e74b23710332d97ad9619d0f4a8ae07b660e35bd828b95517c4ee250db372bd691054f9c9de61b2fc72c1a6244f9e09eda02d2576301cf46 WHIRLPOOL a7dea6f26fa9635d57cedaf66724672c9c0f43cdd28363b1849b2054094d721b1949f4a32557d5e5fa229ac0bfbb76d55dd647da10f46d64c173d34c20f7eea1
+DIST git-2.9.2.tar.xz 4019916 SHA256 f8f546648f77f246f1302e3ec4037c81db25af1f02931597148c5bf61fac2db5 SHA512 4a6e2ac7680b8896dc9c58a3fabad2201c800dbca26f0c117892b9d6149b02ff0335d313037f50771932cea4971913e3d9b9e79f22e075b3ed77a1a69ddc11ac WHIRLPOOL ebd538f1877a362c7bbd0eb98e3c3d9d96b81e75cdb4f587d9aa5be09d66fd61e7b2e400465f64d238fd912a2a3b4be1829a95ba21ec09115be5362347d30878
 DIST git-htmldocs-2.4.11.tar.xz 997132 SHA256 2764af41b319f4d11b29832de4bd05392f2887d9a1d3c56c864fb081920eac97 SHA512 d5d2abae9cc303fe8ebeb72ae7078d44db94610d549ca03afffcbbef8b611efda662677423d9ff97a0c7a2384bbd4c3468b01a2ecd7b68f4fdc89e62ad688eb4 WHIRLPOOL 66cd4fc754be7c103ca58a030d4799ba988792419a426e85a39805172e6329ec617b3561696dc74be36801cca0b17a26102a194a1a58d6c7b9ee1ab17752c4a6
 DIST git-htmldocs-2.5.5.tar.xz 1010216 SHA256 15de2f234cf419496399f7ad396709544d62537488a8e5200e6e34b0f1a685e7 SHA512 265ddf3835352f85eb2e2ee983eb8aaf37bc7b151968866bdb8b9bb6782cdb72dbd1fefe5d7f694a6825954d49bcf4c799e8bcb4e3b25e3f228f6f97f041fd9b WHIRLPOOL 90da44c0bdb6f9ff428d1673289e612936ed5f26110cd13d155c8cbef8433b13bd8b15cea88f967224a699e4c3a6ac41d70b67be1b25c4d35989879626eb10ad
 DIST git-htmldocs-2.6.6.tar.xz 1021856 SHA256 897fb0bc7e2eb67a4b582c963f337fda3a6ad2b23bca55e27f23f7d15bad7c5d SHA512 85dcd8514e1ba2cb591512a0003aedf25eafbf185ba1eed01f8adfd9eb467d29b17108e6b087183004004ab17301316d403cd6762619ac2a030a565ea5c776b3 WHIRLPOOL 3cd964f1d0164db98e97e0097813a620911adadd9c50837e23a5ca79eb0f2d988aa68317b5b79fa7b052900564657c36d050e75841a1018d5ff12e1299c01dc6
 DIST git-htmldocs-2.7.3.tar.xz 1031848 SHA256 f71f5e8e1a6103e83ea794f367bc419a1d14ba0f79ebacdc81b3b9430714adea SHA512 50de5d9d3c0f6d874a6a4bc3b247a1795b1bcf154a276b546f88c3b5f5fb2eb27212d207a4bb50c04cba36d8537853afd25816addfb87c9a50e18528d93586fe WHIRLPOOL 057d9bebfe51c29a0a7f689baa9873cb6a54feb1d2869c541396902b160379c9220c5de79a4cb59c6e804e5c7557c0fd141b89621b97d3b495dc6e0a77c67a9f
 DIST git-htmldocs-2.7.4.tar.xz 1032428 SHA256 3fae21e2e68104621ea1405be73192b46bf3ef29bbc248a81b1e7e6fcf5acfad SHA512 f05b7b8a4dd4abe23f7e51982e9c33026aa31610ac8640028aeae6b310b70b764aee9a81fa702ed0712ccf1b7ad897e06163eb5c5246c14f6cce7c5f4e462682 WHIRLPOOL 87fc486d182a4b72fd906105fefcc53b722c4ae6832b290cd6f759ac1eca7ebfbbe7c0e72c1d7b5ef3581d19d7576f1d0387d6e5b0a33d960d57f59ee61a7869
 DIST git-htmldocs-2.8.4.tar.xz 1042260 SHA256 78135be591e3a68d1030a76e343d59622e5e40f6990667f4385a01d9dafe9bbd SHA512 5da40db4421f94a969b83bfa0ea6e5ccf3fce8c2085ea2271a2eb3e1b4fc496c36ae8790207cd1814ff747b7633bb27fd53bb9c012f866ea1e7f1cc8065379dd WHIRLPOOL 4f80041ad4ef8b178a6b91313680433a7e07b0ecb15354304436d70880063b2f9cdd875fcd95684a817272d05a57485e1863e9e06c3788eddf0e5f031279ea9a
-DIST git-htmldocs-2.9.0.tar.xz 1049236 SHA256 664dc1aa20966a91cf6b90d282bb5f93b4e4c831a32a0791f43218389ce3b955 SHA512 16dbbb1d3179932f9e383faa8383b948fb5d18761c8b5d9530e00a363e739c3a03cdaf1c96e303a6e98af5c81caaaa116fdd4ea8b867e5317dc0531bff33c843 WHIRLPOOL a2e98fc454fb1758675aaf2b9e198e4d5ce2883ebd6534264142131939fdd9a3597e1f39f7e63857f5b64c40f4f15042a30f1dc62d58e281f72191221babd09c
 DIST git-htmldocs-2.9.1.tar.xz 1053220 SHA256 67421138a9319cc72b0ec8295c2428daf25449eb4f76f727e0464990370afea1 SHA512 bd9a1608ac9e7683f8208d83688e20e4ac8cbd91c205dfce471e33d108f1b56db8f9106716eb280a9d56733ebdfd9bceb5f7af0fa1d5d6c5fd30e3446ad0529a WHIRLPOOL 578b29549f3778707507b0e7185ade8ea609284cc2cf643e8b7a5364b34edbde6600f8e19126e89240ae411111f28c3ce37d0e6591a260afda8119a2a205deab
+DIST git-htmldocs-2.9.2.tar.xz 1053284 SHA256 6dddb003184f2ab68aa6b54e02e1e55c82c774fe6e74602e9dbefdf06826fb1c SHA512 ab13c3d8339de894084aab1a3db08f4571c22b052f7792235dfcb4ed55ff98ecad84125ec2a083bb0a3df9b8eca0e40fb7085951fbdf10d888eebc0bfbf91a17 WHIRLPOOL 6350a8867aa7f14c0ea70c71c099d8880fc3494152a9bb708a608dd969cb526e1ce015a197a5bc9f27604ad4da7ed035ca9a80381e2c9bfda932ac42c49585dd
 DIST git-manpages-2.4.11.tar.xz 373956 SHA256 0a1fff7650e635339f92985a47198f5f6664eda1c233c3cf48e92f22c3735db2 SHA512 78226baf1c8be28c456a84b06f403af9b918cd3e46218917cce18b3b9ce494600bf00014b818ca0dff9f675aca8b17cd9f7893c7063e218d719a9567e81d9040 WHIRLPOOL f8883ca7d327c378937f62287cbb515b5271cb8aeda18d32135f1c7ea71c9f39282fe55b191476f046de4815a994e4f6f98696d9353f0bfcca7994101398786c
 DIST git-manpages-2.5.5.tar.xz 378304 SHA256 41b66002436add0781618764c3f0c8222bac7d8a636f1d7e2994480b22369930 SHA512 bebcc04fa54080316d01f1bd1ba7b91a1712e6c6a6f95306d9f079cf5858cf0fb2ccea24c606153e9adb99e956c5dbae5a5c7a7a0ed8c643efdf5a5db599cda1 WHIRLPOOL e72873d3f1a404a311e643d89cf65996d884e794e468417272cdda494ef621f0ebf875faa17433e443fcece54608c59a3c094372101bf4342fadcf8395dabce8
 DIST git-manpages-2.6.6.tar.xz 381588 SHA256 0f64c1db015e3c74e56eef646a9fdd456cf043cae54714f404ad9b35ddb537a0 SHA512 bd8573f58bd988f78978041b88643e6d0af99ae0df4be6ec80db7de6e042970a23d9a153e84ddb8ffc538724b1482ff6dac7594462e28073067f54d040fdddfd WHIRLPOOL 3e8af6df1b96e3211c5799ace846dab331f30c1133c1d093e344b4576d8f588631e29187909b600112a9f7b42a0de63f56cec953e0d162cc49c2b6efeef0db53
 DIST git-manpages-2.7.3.tar.xz 384544 SHA256 9f088427c61a9e0a840007c7f50fc6f7caba36ac8c403460c49210983090496d SHA512 883441df049bfaf0f22cf9d17041125dc9c8f0e7d94efa7a4188a68c2242d1b4c3d34fd3bd3ecdd2af905ee2f8fb5fefd0ce6328dd76c665f7ec20e3b9c87d1b WHIRLPOOL 7ee013444665366ecb8f3df507a3c5af8a9f48d3185783a94db827b192c32ac6998157eb42bcbfe397f96d452451b2416c32e2dffbabc71062422e7c5e25c184
 DIST git-manpages-2.7.4.tar.xz 384460 SHA256 d04fd81ab8aa32efbe54acd27ab5c88ef4ab615313e4cdfa793dd0065899ce25 SHA512 1af6f0d9fc3945a5a215092caabd0963f3eaa35c5f3b0270861b625bf7bd88e4fdea9b3e50ce1b10c79a12ee2b06b203fab4aa9d566560535c1decf7b2d987cd WHIRLPOOL 38306b6e198336dd3c75a9fd032b636e0e43a3b75eba2746d2d42c3752cf7405b1f8572199748509974d68bfc77c74fbea52626884f9b509d8b593cefce4aad5
 DIST git-manpages-2.8.4.tar.xz 387168 SHA256 d2ddfc302e5b3c0ad182916b27c28d95bc667ea8b9db8dc099bf3d8d62b8b7f5 SHA512 d4ffca6ad8ff0b6bfab984eb06ad5c6c0cf73cfb4beaff4e924b2bd117a4a369e928faa2ca09f11903ebc52249ad24e2b68e7b571965a2ef48f5731ad94b9bef WHIRLPOOL a22d7ad38ccfb399325e321cecc7255fdf4ca05f14e92acfe94e74b816199d2e057a559f6e3eede2df768d762457eb2a43f1e9c76e8b6e76c7498dc9547dcf25
-DIST git-manpages-2.9.0.tar.xz 392440 SHA256 dc85c1afa923fd709d651a49d0a720d50a3c248cb16c6c09517cceae88fe8445 SHA512 ad3fbf7ed716d31d0e1006168a9c49477279961e8c4b2d0d249f57d07ed3fdfef7c42bd2df4d3a9b06d54df45e2e2a43b9959aee951566c02e21a4ff3df23483 WHIRLPOOL 0da980cf24bea0e8a6582e9a2f9f19ea6628beb76eb43fd438cabb0a0f1c0686db8806e109716cee39a6a6b9cf6d3bba7c74c81e49558d0aa1424284525c2ac7
 DIST git-manpages-2.9.1.tar.xz 392532 SHA256 17bd0ac02f6923e509238be066a0dd79081c420ba94ee5cecb79ef829c6631ed SHA512 401c5dc2820188c1dda909d9372b09ba24b34a3a742feb624c53d31f0af2c5e1f08d3d45bbe00d40dfaa2c64d0d33796ad3ee1c5128a824ccd24f6759cf35ac0 WHIRLPOOL 9f3a2b61d48f81892e7bb5082f9d0c369c9fb750f964b6fb5062672c0c318b6dc8a0ae8fef547be198b0929164cbe4087ee7313f6e09402ba17394e9cd62d522
+DIST git-manpages-2.9.2.tar.xz 392552 SHA256 4c5c516ee4c0412b9475739e2125a257f6022e7c7bd006827c376fe70d47c323 SHA512 0bfbe862ba3b735e38f0fef28f1491bdbd6aa60e7402a0bc4f9aea5f9774103aa2b20a880fabd7956aa1b87e6bbf13359aa37e7af0451c8d816aeb41e0610d60 WHIRLPOOL 28e9db9c4930bce124c89cac16c9285b2211888658f1445fa2e9a18fdd2d7b8c6ea68f8d65b2c54c34d271567626e8ad7714daefdf18f9a75a1979758301f2d0
diff --git a/dev-vcs/git/git-2.9.0.ebuild b/dev-vcs/git/git-2.9.2.ebuild
similarity index 100%
rename from dev-vcs/git/git-2.9.0.ebuild
rename to dev-vcs/git/git-2.9.2.ebuild
diff --git a/games-action/beathazardultra/beathazardultra-20130308-r1.ebuild b/games-action/beathazardultra/beathazardultra-20130308-r1.ebuild
new file mode 100644
index 000000000000..96524063883d
--- /dev/null
+++ b/games-action/beathazardultra/beathazardultra-20130308-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: unbundle allegro[gtk...] (no multilib on amd64 and 5.0.9 soname)
+
+EAPI=6
+inherit eutils unpacker
+
+DESCRIPTION="Intense music-driven arcade shooter powered by your music"
+HOMEPAGE="http://www.coldbeamgames.com/"
+SRC_URI="beathazard-installer_03-08-13"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="bundled-libs"
+RESTRICT="bindist fetch splitdebug"
+QA_PREBUILT="/opt/${PN}/BeatHazard_Linux2
+	/opt/${PN}/hge_lib/*"
+
+DEPEND="app-arch/unzip"
+RDEPEND="
+	virtual/opengl
+	amd64? (
+		!bundled-libs? (
+			>=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)]
+			>=virtual/jpeg-0-r2[abi_x86_32(-)]
+		)
+		>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
+		>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+		>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+		>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
+		>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+	)
+	x86? (
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		!bundled-libs? (
+			media-libs/libpng:1.2
+			virtual/jpeg
+		)
+	)"
+
+S=${WORKDIR}/data
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to ${DISTDIR}"
+	einfo
+}
+
+src_unpack() {
+	unpack_zip ${A}
+}
+
+src_prepare() {
+	if ! use bundled-libs ; then
+		einfo "Removing bundled libs..."
+		rm -v all/hge_lib/libjpeg.so* all/hge_lib/libpng12.so* || die
+	fi
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r all/*
+
+	dodoc Linux.README
+
+	newicon SmileLogo.png ${PN}.png
+	make_desktop_entry ${PN}
+	make_wrapper ${PN} "./BeatHazard_Linux2" "/opt/${PN}" "/opt/${PN}/hge_lib"
+
+	fperms +x /opt/${PN}/BeatHazard_Linux2
+}
diff --git a/games-action/bomberclone/bomberclone-0.11.8-r1.ebuild b/games-action/bomberclone/bomberclone-0.11.8-r1.ebuild
new file mode 100644
index 000000000000..62441c105d47
--- /dev/null
+++ b/games-action/bomberclone/bomberclone-0.11.8-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils autotools
+
+DESCRIPTION="BomberMan clone with network game support"
+HOMEPAGE="http://www.bomberclone.de/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="X"
+
+DEPEND=">=media-libs/libsdl-1.1.0[video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[mod]
+	X? ( x11-libs/libXt )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc52.patch
+	"${FILESDIR}"/${P}-underlink.patch
+)
+
+src_prepare() {
+	default
+
+	ecvs_clean
+	mv configure.{in,ac} || die
+	sed -i -e 's/configure.in/configure.ac/' configure.ac || die
+	sed -i \
+		-e "s:/share/games/:share/:" \
+		configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with X x) \
+		--datadir=/usr/share
+	sed -i \
+		-e "/PACKAGE_DATA_DIR/ s:/usr/games/share/games/:/usr/share:" \
+		config.h || die
+}
+
+src_install() {
+	default
+
+	dobin src/${PN}
+
+	insinto /usr/share/${PN}
+	doins -r data/{gfx,maps,player,tileset,music}
+	find "${D}" -name "Makefile*" -exec rm -f '{}' +
+
+	doicon data/pixmaps/bomberclone.png
+	make_desktop_entry bomberclone Bomberclone
+}
diff --git a/games-action/bomberclone/files/bomberclone-0.11.8-gcc52.patch b/games-action/bomberclone/files/bomberclone-0.11.8-gcc52.patch
index 51fdaee52c5f..fd77e1b7b1d6 100644
--- a/games-action/bomberclone/files/bomberclone-0.11.8-gcc52.patch
+++ b/games-action/bomberclone/files/bomberclone-0.11.8-gcc52.patch
@@ -1,5 +1,5 @@
---- src/single.c.old	2015-09-17 09:21:57.826930680 +0200
-+++ src/single.c	2015-09-17 09:22:04.315824372 +0200
+--- a/src/single.c	2015-09-17 09:21:57.826930680 +0200
++++ b/src/single.c	2015-09-17 09:22:04.315824372 +0200
 @@ -476,7 +476,7 @@
  };
  
diff --git a/games-action/bomberclone/files/bomberclone-0.11.8-underlink.patch b/games-action/bomberclone/files/bomberclone-0.11.8-underlink.patch
index d534df6192b6..18c063b56db9 100644
--- a/games-action/bomberclone/files/bomberclone-0.11.8-underlink.patch
+++ b/games-action/bomberclone/files/bomberclone-0.11.8-underlink.patch
@@ -1,5 +1,5 @@
---- configure.in.old	2011-06-18 18:23:48.633605738 +0200
-+++ configure.in	2011-06-18 18:26:26.910628408 +0200
+--- a/configure.in	2011-06-18 18:23:48.633605738 +0200
++++ b/configure.in	2011-06-18 18:26:26.910628408 +0200
 @@ -33,7 +33,7 @@
      )
      
diff --git a/games-action/brutal-legend/brutal-legend-20130615-r2.ebuild b/games-action/brutal-legend/brutal-legend-20130615-r2.ebuild
new file mode 100644
index 000000000000..5a57abab331c
--- /dev/null
+++ b/games-action/brutal-legend/brutal-legend-20130615-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: unbundle libsdl-2
+
+EAPI=6
+
+inherit eutils unpacker gnome2-utils
+
+TIMESTAMP=${PV:0:4}-${PV:4:2}-${PV:6:2}
+DESCRIPTION="Unleash the power of Heavy Metal to reign down fire from the sky"
+HOMEPAGE="https://www.ea.com/de/brutal-legend"
+SRC_URI="BrutalLegend-Linux-${TIMESTAMP}-setup.bin"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="bindist fetch splitdebug"
+
+MYGAMEDIR="/opt/${PN}"
+QA_PREBUILT="${MYGAMEDIR#/}/lib/*
+	${MYGAMEDIR#/}/Buddha.bin.x86"
+
+RDEPEND="
+	amd64? (
+		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+		>=virtual/glu-9.0-r1[abi_x86_32(-)]
+		>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+		>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
+		>=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
+		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+		>=x11-libs/libxcb-1.9.1[abi_x86_32(-)]
+	)
+	x86? (
+		sys-libs/zlib
+		virtual/glu
+		virtual/opengl
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libxcb
+
+	)"
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/data
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  https://www.humblebundle.com/store"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_unpack() {
+	unpack_zip ${A}
+}
+
+src_install() {
+	newicon -s 256 Buddha.png ${PN}.png
+	make_wrapper ${PN} "./Buddha.bin.x86" "${MYGAMEDIR}" "${MYGAMEDIR}/lib"
+	make_desktop_entry ${PN}
+
+	dodir "${MYGAMEDIR}"
+	# this is over 9000!!!! ...eh, 8GB data
+	mv * "${D%/}/${MYGAMEDIR}" || die
+
+	fperms +x "${MYGAMEDIR}/Buddha.bin.x86"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index e4a9b10dbf81..23cfa80e7a6c 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -1,3 +1,3 @@
 DIST opencollada-1.2.2_p20150207.tar.gz 11715849 SHA256 b6a4362c559d790a04dfef4606cb0a0ffe01e34708f898bf3453e69318bc5cc1 SHA512 0780e4401f130832d9802ddd6183ac11294ed84f43e0b497673c66fa2c1ae47ebc853484f8e68871887a1e99ab1f1df786cfc6ebd5868f039d9101ab82646f09 WHIRLPOOL 4cf7c7f03caf37e4c9342e139ed036b3c43984917ac4a3876e464f2065e2c515e2e85e5408d32901572d6b56a94d82963f5a2e6d3bb17dec04ecf35ee8be2d98
 DIST opencollada-1.6.18.tar.gz 11807970 SHA256 9835aa0b6efdb6602e58a84ee245a443002dc7196af3b7660e6888680d5d5990 SHA512 e4f72c41c8c619bbfb842517fb1217f616ebe6d9576ef0b7fd8bcb26443b66245107e8d04475c32946b7b73bf093977d1911d486f2d2ae92a165cfde55f67baa WHIRLPOOL 7d35758667c7a1293c376712d47cae0f87ea243e04de9fc526297805fa59f405510584ac6d79c13f77f80f1ef0e6cbea05692b3c65a09d88031dd220b4132ead
-DIST opencollada-1.6.23.tar.gz 11816731 SHA256 ca242cbf4f25931df95c5a5d7f0af17452d72c73783e74c5735118e37bb093ce SHA512 6296f44a33bf80f23789276977119b37fbdc32e8fad583d1d80902311ad6f37982e5e04a527ac84ac61650bf300354bd61195bbf26f8e05b6981d47ef82e3b10 WHIRLPOOL 1f133a5513b3a1c78e78ef29ba997094867481507c1409e38190ea541375979eaabc8ffc2091880fd359695f0b11869257064db26ce5b90b284134d7325ca47b
+DIST opencollada-1.6.25.tar.gz 11817949 SHA256 9cea5c85164758b01ac0d5c37ea10373a0d1fc7eba1e5d9dea9ba4af8aa6dca9 SHA512 48ede841d43beddbaa153899e2a1eb45d875c468536b276f6b9cb80a84b90b16ca376fb2fbc68a7f25f4908ef94a376c431ed7e94e7c6657afe60464f067a00e WHIRLPOOL e074a66424e66b98476d40f7c525a4e05e0e5537efc7c695f0e1b9099a51bd8d4645ce7a2ceae646607c7399446f22098a93dbc0bcf8c49013a49940f5737d87
diff --git a/media-libs/opencollada/opencollada-1.6.23.ebuild b/media-libs/opencollada/opencollada-1.6.25.ebuild
similarity index 84%
rename from media-libs/opencollada/opencollada-1.6.23.ebuild
rename to media-libs/opencollada/opencollada-1.6.25.ebuild
index 028f63147757..2978d51245b0 100644
--- a/media-libs/opencollada/opencollada-1.6.23.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.25.ebuild
@@ -46,15 +46,11 @@ src_prepare() {
 	default
 
 	# Remove bundled depends that have portage equivalents
-	rm -R Externals/{expat,lib3ds,LibXML,pcre,zlib,zziplib} || die
+	rm -rv Externals/{expat,lib3ds,LibXML,pcre,zlib,zziplib} || die
 
 	# Remove unused build systems
-	rm Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die
+	rm -v Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die
 	find "${S}" -name SConscript -delete || die
-
-	# Fix insecure RUNPATHS vulnerability
-	sed '/link_directories/i SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)' \
-		-i COLLADAValidator/CMakeLists.txt || die "sed failed"
 }
 
 src_configure() {
diff --git a/media-sound/clementine/clementine-1.2.3-r1.ebuild b/media-sound/clementine/clementine-1.2.3-r2.ebuild
similarity index 98%
rename from media-sound/clementine/clementine-1.2.3-r1.ebuild
rename to media-sound/clementine/clementine-1.2.3-r2.ebuild
index 5f728cb1faa5..852c5a2d9f8a 100644
--- a/media-sound/clementine/clementine-1.2.3-r1.ebuild
+++ b/media-sound/clementine/clementine-1.2.3-r2.ebuild
@@ -31,7 +31,7 @@ REQUIRED_USE="
 # qca dep is temporary for bug #489850
 COMMON_DEPEND="
 	app-crypt/qca:2[qt4(+)]
-	>=dev-qt/qtcore-4.5:4
+	>=dev-qt/qtcore-4.5:4[ssl]
 	>=dev-qt/qtgui-4.5:4
 	dbus? ( >=dev-qt/qtdbus-4.5:4 )
 	>=dev-qt/qtopengl-4.5:4
@@ -65,7 +65,7 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	dbus? ( udisks? ( sys-fs/udisks:0 ) )
 	mms? ( media-plugins/gst-plugins-libmms:0.10 )
-	mtp? ( gnome-base/gvfs )
+	mtp? ( gnome-base/gvfs[mtp] )
 	projectm? ( >=media-libs/libprojectm-1.2.0 )
 	media-plugins/gst-plugins-meta:0.10
 	media-plugins/gst-plugins-gio:0.10
diff --git a/media-sound/clementine/clementine-1.2.3.ebuild b/media-sound/clementine/clementine-1.2.3.ebuild
index 4de381c1dd3d..316efe6c7c20 100644
--- a/media-sound/clementine/clementine-1.2.3.ebuild
+++ b/media-sound/clementine/clementine-1.2.3.ebuild
@@ -31,7 +31,7 @@ REQUIRED_USE="
 # qca dep is temporary for bug #489850
 COMMON_DEPEND="
 	app-crypt/qca:2[qt4(+)]
-	>=dev-qt/qtcore-4.5:4
+	>=dev-qt/qtcore-4.5:4[ssl]
 	>=dev-qt/qtgui-4.5:4
 	dbus? ( >=dev-qt/qtdbus-4.5:4 )
 	>=dev-qt/qtopengl-4.5:4
diff --git a/media-sound/clementine/clementine-1.3.1-r1.ebuild b/media-sound/clementine/clementine-1.3.1-r2.ebuild
similarity index 98%
rename from media-sound/clementine/clementine-1.3.1-r1.ebuild
rename to media-sound/clementine/clementine-1.3.1-r2.ebuild
index 4c1168c1ebd7..a64825191cdf 100644
--- a/media-sound/clementine/clementine-1.3.1-r1.ebuild
+++ b/media-sound/clementine/clementine-1.3.1-r2.ebuild
@@ -34,7 +34,7 @@ COMMON_DEPEND="
 	dev-libs/libxml2
 	dev-libs/protobuf:=
 	dev-libs/qjson
-	>=dev-qt/qtcore-4.5:4
+	>=dev-qt/qtcore-4.5:4[ssl]
 	>=dev-qt/qtgui-4.5:4
 	>=dev-qt/qtopengl-4.5:4
 	>=dev-qt/qtsql-4.5:4
@@ -67,7 +67,7 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	dbus? ( udisks? ( sys-fs/udisks:0 ) )
 	mms? ( media-plugins/gst-plugins-libmms:1.0 )
-	mtp? ( gnome-base/gvfs )
+	mtp? ( gnome-base/gvfs[mtp] )
 	media-plugins/gst-plugins-meta:1.0
 	media-plugins/gst-plugins-soup:1.0
 	media-plugins/gst-plugins-taglib:1.0
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index b52c4d274bcf..bb4be8da23b2 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -35,7 +35,7 @@ COMMON_DEPEND="
 	dev-libs/libxml2
 	dev-libs/protobuf:=
 	dev-libs/qjson
-	>=dev-qt/qtcore-4.5:4
+	>=dev-qt/qtcore-4.5:4[ssl]
 	>=dev-qt/qtgui-4.5:4
 	>=dev-qt/qtopengl-4.5:4
 	>=dev-qt/qtsql-4.5:4
@@ -68,7 +68,7 @@ RDEPEND="${COMMON_DEPEND}
 	dbus? ( udisks? ( sys-fs/udisks:2 )
 	        udisks_legacy? ( sys-fs/udisks:0 ) )
 	mms? ( media-plugins/gst-plugins-libmms:1.0 )
-	mtp? ( gnome-base/gvfs )
+	mtp? ( gnome-base/gvfs[mtp] )
 	media-plugins/gst-plugins-meta:1.0
 	media-plugins/gst-plugins-soup:1.0
 	media-plugins/gst-plugins-taglib:1.0
@@ -116,7 +116,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_WERROR=OFF
 		-DLINGUAS="${langs}"
-		-DENABLE_AMAZON_CLOUD_DRIVE="$(usex amazoncloud)"
 		-DENABLE_AUDIOCD="$(usex cdda)"
 		-DENABLE_DBUS="$(usex dbus)"
 		-DENABLE_UDISKS2="$(usex udisks)"
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 58b0bf235282..d921a4bdad67 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 15 Jul 2016 22:10:41 +0000
+Sat, 16 Jul 2016 14:40:46 +0000
diff --git a/metadata/glsa/glsa-201607-04.xml b/metadata/glsa/glsa-201607-04.xml
new file mode 100644
index 000000000000..f52915c3545e
--- /dev/null
+++ b/metadata/glsa/glsa-201607-04.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201607-04">
+  <title>GD: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in GD, the worst of which
+    allows remote attackers to execute arbitrary code.
+  </synopsis>
+  <product type="ebuild"></product>
+  <announced>July 16, 2016</announced>
+  <revised>July 16, 2016: 1</revised>
+  <bug>504872</bug>
+  <bug>538686</bug>
+  <bug>581942</bug>
+  <access>remote</access>
+  <affected>
+    <package name="media-libs/gd" auto="yes" arch="*">
+      <unaffected range="ge">2.2.2</unaffected>
+      <vulnerable range="lt">2.2.2</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>GD is a graphic library for fast image creation.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in GD. Please review the
+      CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could possibly execute arbitrary code with the
+      privileges of the process, or cause a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All GD users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=media-libs/gd-2.2.2"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-2497">
+      CVE-2014-2497
+    </uri>
+    <uri link="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-9709">
+      CVE-2014-9709
+    </uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-3074">CVE-2016-3074</uri>
+  </references>
+  <metadata tag="requester" timestamp="Thu, 25 Feb 2016 07:19:37 +0000">
+    BlueKnight
+  </metadata>
+  <metadata tag="submitter" timestamp="Sat, 16 Jul 2016 13:08:00 +0000">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201607-05.xml b/metadata/glsa/glsa-201607-05.xml
new file mode 100644
index 000000000000..c5c22623d876
--- /dev/null
+++ b/metadata/glsa/glsa-201607-05.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201607-05">
+  <title>Cacti: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Cacti, the worst of
+    which could lead to the remote execution of arbitrary code.
+  </synopsis>
+  <product type="ebuild"></product>
+  <announced>July 16, 2016</announced>
+  <revised>July 16, 2016: 1</revised>
+  <bug>519900</bug>
+  <bug>568400</bug>
+  <bug>570984</bug>
+  <bug>574412</bug>
+  <bug>582996</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-analyzer/cacti" auto="yes" arch="*">
+      <unaffected range="ge">0.8.8h</unaffected>
+      <vulnerable range="lt">0.8.8h</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Cacti is a complete frontend to rrdtool.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Cacti. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could possibly execute arbitrary code with the
+      privileges of the process, or remote authenticated users could bypass
+      intended access restrictions.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Cacti users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-analyzer/cacti-0.8.8h"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-5261">CVE-2014-5261</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-5262">CVE-2014-5262</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-8369">CVE-2015-8369</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-8377">CVE-2015-8377</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-8604">CVE-2015-8604</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-2313">CVE-2016-2313</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-3172">CVE-2016-3172</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-3659">CVE-2016-3659</uri>
+  </references>
+  <metadata tag="requester" timestamp="Tue, 26 Apr 2016 06:10:39 +0000">
+    BlueKnight
+  </metadata>
+  <metadata tag="submitter" timestamp="Sat, 16 Jul 2016 13:14:38 +0000">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201607-06.xml b/metadata/glsa/glsa-201607-06.xml
new file mode 100644
index 000000000000..ece3869dc569
--- /dev/null
+++ b/metadata/glsa/glsa-201607-06.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201607-06">
+  <title>CUPS: Buffer overflow</title>
+  <synopsis>A buffer overflow in CUPS might allow remote attackers to execute
+    arbitrary code.
+  </synopsis>
+  <product type="ebuild"></product>
+  <announced>July 16, 2016</announced>
+  <revised>July 16, 2016: 1</revised>
+  <bug>539582</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-print/cups" auto="yes" arch="*">
+      <unaffected range="ge">2.0.2-r1</unaffected>
+      <vulnerable range="lt">2.0.2-r1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>CUPS, the Common Unix Printing System, is a full-featured print server.</p>
+  </background>
+  <description>
+    <p>A vulnerability has been discovered in CUPS concerning the handling of
+      compressed raster files.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could possibly execute arbitrary code with the
+      privileges of the process.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All CUPS users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-print/cups-2.0.2-r1"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-9679">CVE-2014-9679</uri>
+  </references>
+  <metadata tag="requester" timestamp="Fri, 01 Jul 2016 05:48:13 +0000">b-man</metadata>
+  <metadata tag="submitter" timestamp="Sat, 16 Jul 2016 13:19:26 +0000">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201607-07.xml b/metadata/glsa/glsa-201607-07.xml
new file mode 100644
index 000000000000..ba6017d172ad
--- /dev/null
+++ b/metadata/glsa/glsa-201607-07.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201607-07">
+  <title>Chromium: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in the Chromium web
+    browser, the worst of which allows remote attackers to execute arbitrary
+    code.
+  </synopsis>
+  <product type="ebuild"></product>
+  <announced>July 16, 2016</announced>
+  <revised>July 16, 2016: 1</revised>
+  <bug>584310</bug>
+  <bug>586704</bug>
+  <access>remote</access>
+  <affected>
+    <package name="www-client/chromium" auto="yes" arch="*">
+      <unaffected range="ge">51.0.2704.103</unaffected>
+      <vulnerable range="lt">51.0.2704.103</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Chromium is an open-source browser project that aims to build a safer,
+      faster, and more stable way for all users to experience the web.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in the Chromium web
+      browser. Please review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could possibly execute arbitrary code with the
+      privileges of the process, cause a Denial of Service condition, obtain
+      sensitive information, or bypass security restrictions.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Chromium users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=www-client/chromium-51.0.2704.103"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1672">CVE-2016-1672</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1673">CVE-2016-1673</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1674">CVE-2016-1674</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1675">CVE-2016-1675</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1676">CVE-2016-1676</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1677">CVE-2016-1677</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1678">CVE-2016-1678</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1679">CVE-2016-1679</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1680">CVE-2016-1680</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1681">CVE-2016-1681</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1682">CVE-2016-1682</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1683">CVE-2016-1683</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1684">CVE-2016-1684</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1685">CVE-2016-1685</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1686">CVE-2016-1686</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1687">CVE-2016-1687</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1688">CVE-2016-1688</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1689">CVE-2016-1689</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1690">CVE-2016-1690</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1691">CVE-2016-1691</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1692">CVE-2016-1692</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1693">CVE-2016-1693</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1694">CVE-2016-1694</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1695">CVE-2016-1695</uri>
+  </references>
+  <metadata tag="requester" timestamp="Wed, 22 Jun 2016 11:53:59 +0000">b-man</metadata>
+  <metadata tag="submitter" timestamp="Sat, 16 Jul 2016 13:23:11 +0000">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 58b0bf235282..adee049f4cc9 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 15 Jul 2016 22:10:41 +0000
+Sat, 16 Jul 2016 14:40:47 +0000
diff --git a/metadata/md5-cache/app-admin/apache-tools-2.4.23 b/metadata/md5-cache/app-admin/apache-tools-2.4.23
index ca3c870bbb7b..5cc712ed8c00 100644
--- a/metadata/md5-cache/app-admin/apache-tools-2.4.23
+++ b/metadata/md5-cache/app-admin/apache-tools-2.4.23
@@ -4,11 +4,11 @@ DESCRIPTION=Useful Apache tools - htdigest, htpasswd, ab, htdbm
 EAPI=6
 HOMEPAGE=https://httpd.apache.org/
 IUSE=libressl ssl
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=dev-libs/apr-1.5.0:1 dev-libs/apr-util:1 dev-libs/expat dev-libs/libpcre kernel_linux? ( sys-apps/util-linux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/httpd/httpd-2.4.23.tar.bz2
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
-_md5_=5af8a3ee96882203924cac3145c85598
+_md5_=5c598c7763d7d7bec9ce1d637627e2ef
diff --git a/metadata/md5-cache/app-misc/dvorakng-0.6.0 b/metadata/md5-cache/app-misc/dvorakng-0.6.0
index 334b04123ed3..493749ddc4ca 100644
--- a/metadata/md5-cache/app-misc/dvorakng-0.6.0
+++ b/metadata/md5-cache/app-misc/dvorakng-0.6.0
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install
-DEPEND=sys-libs/ncurses
+DEPEND=sys-libs/ncurses:* virtual/pkgconfig
 DESCRIPTION=Dvorak typing tutor
-EAPI=0
+EAPI=6
 HOMEPAGE=http://freshmeat.net/projects/dvorakng/?topic_id=71%2C861
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses
+RDEPEND=sys-libs/ncurses:*
 SLOT=0
 SRC_URI=http://www.free.of.pl/n/nopik/dvorakng-0.6.0rc1.tar.bz2
 _eclasses_=multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
-_md5_=5606ace14e9b4be68878e136b6b018df
+_md5_=ce1e801d0f9fc9fca393c9491e54553c
diff --git a/metadata/md5-cache/app-text/liblangtag-0.6.0 b/metadata/md5-cache/app-text/liblangtag-0.6.0
new file mode 100644
index 000000000000..aa7f3188a0b1
--- /dev/null
+++ b/metadata/md5-cache/app-text/liblangtag-0.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/glib:* dev-libs/libxml2 introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) dev-util/gtk-doc sys-devel/gettext introspection? ( dev-libs/gobject-introspection-common ) test? ( dev-libs/check )
+DESCRIPTION=An interface library to access tags for identifying languages
+EAPI=6
+HOMEPAGE=https://tagoh.bitbucket.org/liblangtag/
+IUSE=introspection static-libs test
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=|| ( LGPL-3 MPL-1.1 )
+RDEPEND=dev-libs/glib:* dev-libs/libxml2 introspection? ( >=dev-libs/gobject-introspection-0.10.8 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://bitbucket.org/tagoh/liblangtag/downloads/liblangtag-0.6.0.tar.bz2
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
+_md5_=21e065dc35254afb00cadd86e785d65a
diff --git a/metadata/md5-cache/dev-java/cssparser-0.9.18 b/metadata/md5-cache/dev-java/cssparser-0.9.18
deleted file mode 100644
index 208cd30f0ed3..000000000000
--- a/metadata/md5-cache/dev-java/cssparser-0.9.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=dev-java/sac:0 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=API for parsing CSS 2 in Java
-EAPI=5
-HOMEPAGE=http://cssparser.sourceforge.net/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/sac:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://sourceforge/cssparser/cssparser-0.9.18-sources.jar
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3750113d636bae775cfccddb10690ab9
diff --git a/metadata/md5-cache/dev-java/cssparser-0.9.19 b/metadata/md5-cache/dev-java/cssparser-0.9.19
index e4ff1d6b82bc..cc2a205b9826 100644
--- a/metadata/md5-cache/dev-java/cssparser-0.9.19
+++ b/metadata/md5-cache/dev-java/cssparser-0.9.19
@@ -4,10 +4,10 @@ DESCRIPTION=API for parsing CSS 2 in Java
 EAPI=5
 HOMEPAGE=http://cssparser.sourceforge.net/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-java/sac:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/cssparser/cssparser-0.9.19-sources.jar
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b1bdfd6e606fb483a89cbde66d175600
+_md5_=d797250a22bb2153a5f1ff7c1df6df7c
diff --git a/metadata/md5-cache/dev-java/flyingsaucer-7-r2 b/metadata/md5-cache/dev-java/flyingsaucer-7-r2
index b2ceba44bc28..dde121b81589 100644
--- a/metadata/md5-cache/dev-java/flyingsaucer-7-r2
+++ b/metadata/md5-cache/dev-java/flyingsaucer-7-r2
@@ -4,11 +4,11 @@ DESCRIPTION=100% Java XHTML+CSS renderer
 EAPI=5
 HOMEPAGE=https://xhtmlrenderer.dev.java.net/
 IUSE=minimal svg doc source elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1
 RDEPEND=svg? ( >=virtual/jre-1.5 ) !svg? ( >=virtual/jre-1.4 ) >=dev-java/itext-2.0.8:0 svg? ( dev-java/svgsalamander:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.pdoubleya.com/projects/flyingsaucer/downloads/r7/flyingsaucer-R7final-src.zip
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=dffeb93cbe2a9da43a032c058205f8a5
+_md5_=672d2c21b24ad41360c955d85b0eaeef
diff --git a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.91 b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.91
deleted file mode 100644
index f8c11dd5f0c4..000000000000
--- a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.8.0.91
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm prepare prerm setup unpack
-DEPEND=app-arch/zip jce? ( app-arch/unzip ) examples? ( x64-macos? ( app-arch/unzip ) ) pax_kernel? ( sys-apps/paxctl ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
-DESCRIPTION=Oracle's Java SE Development Kit
-EAPI=5
-HOMEPAGE=http://www.oracle.com/technetwork/java/javase/
-IUSE=alsa cups derby doc examples +fontconfig headless-awt javafx jce nsplugin pax_kernel selinux source
-KEYWORDS=~arm ~arm64
-LICENSE=Oracle-BCLA-JavaSE examples? ( BSD )
-RDEPEND=!x64-macos? ( !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) javafx? ( dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/freetype:2 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXtst x11-libs/libXxf86vm x11-libs/pango virtual/opengl ) ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) doc? ( dev-java/java-sdk-docs:1.8 ) fontconfig? ( media-libs/fontconfig:1.0 ) !prefix? ( sys-libs/glibc:* ) selinux? ( sec-policy/selinux-java ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.2.0
-REQUIRED_USE=javafx? ( alsa fontconfig )
-RESTRICT=fetch preserve-libs strip
-SLOT=1.8
-SRC_URI=arm? ( jdk-8u91-linux-arm32-vfp-hflt.tar.gz examples? ( jdk-8u91-linux-arm32-vfp-hflt-demos.tar.gz ) ) arm64? ( jdk-8u91-linux-arm64-vfp-hflt.tar.gz examples? ( jdk-8u91-linux-arm64-vfp-hflt-demos.tar.gz ) ) jce? ( jce_policy-8.zip )
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	java-vm-2	6af4204d3754670375063f20b402ec98	multilib	d062ae4ba2fc40a19c11de2ad89b6616	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=158d634c9df7e859e55098439fa45c50
diff --git a/metadata/md5-cache/dev-java/velocity-1.7 b/metadata/md5-cache/dev-java/velocity-1.7
deleted file mode 100644
index 5cd8e163bc0b..000000000000
--- a/metadata/md5-cache/dev-java/velocity-1.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/commons-collections:0 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/jdom:1.0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 dev-java/jakarta-oro:2.0 java-virtuals/servlet-api:2.3 dev-java/werken-xpath:0 dev-java/ant-core:0 >=virtual/jdk-1.4 test? ( dev-java/ant-junit:0 dev-java/ant-antlr:0 dev-db/hsqldb:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A Java-based template engine for easy creation/rendering of documents that format and present data
-EAPI=5
-HOMEPAGE=http://velocity.apache.org
-IUSE=test elibc_FreeBSD examples doc source elibc_FreeBSD
-KEYWORDS=amd64 x86 ~x86-fbsd
-LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-collections:0 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/jdom:1.0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 dev-java/jakarta-oro:2.0 java-virtuals/servlet-api:2.3 dev-java/werken-xpath:0 dev-java/ant-core:0 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/velocity/engine/1.7/velocity-1.7.tar.gz
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7daf67808e600abd2b36991d3bbb7844
diff --git a/metadata/md5-cache/dev-java/velocity-1.7-r1 b/metadata/md5-cache/dev-java/velocity-1.7-r1
deleted file mode 100644
index 39cef81f9b4c..000000000000
--- a/metadata/md5-cache/dev-java/velocity-1.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/commons-collections:0 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/jdom:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 dev-java/jakarta-oro:2.0 java-virtuals/servlet-api:2.3 dev-java/werken-xpath:0 dev-java/ant-core:0 >=virtual/jdk-1.4 test? ( dev-java/ant-junit:0 dev-java/ant-antlr:0 dev-db/hsqldb:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A Java-based template engine for easy creation/rendering of documents that format and present data
-EAPI=5
-HOMEPAGE=http://velocity.apache.org
-IUSE=test elibc_FreeBSD examples doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=Apache-2.0
-RDEPEND=dev-java/commons-collections:0 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/jdom:0 dev-java/log4j:0 dev-java/avalon-logkit:2.0 dev-java/jakarta-oro:2.0 java-virtuals/servlet-api:2.3 dev-java/werken-xpath:0 dev-java/ant-core:0 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/velocity/engine/1.7/velocity-1.7.tar.gz
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-ant-2	7c5d0c274d390745f5033754a319f515	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a186e9ecf77f9502119093d622d30b81
diff --git a/metadata/md5-cache/dev-java/velocity-1.7-r2 b/metadata/md5-cache/dev-java/velocity-1.7-r2
index 8362b70fc040..4fe577dc4fdc 100644
--- a/metadata/md5-cache/dev-java/velocity-1.7-r2
+++ b/metadata/md5-cache/dev-java/velocity-1.7-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Java framework for easy creation/rendering of documents
 EAPI=5
 HOMEPAGE=http://velocity.apache.org
 IUSE=test elibc_FreeBSD examples doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/jdom:0 dev-java/log4j:0 dev-java/ant-core:0 dev-java/werken-xpath:0 dev-java/jakarta-oro:2.0 dev-java/avalon-logkit:2.0 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/commons-collections:0 java-virtuals/servlet-api:2.3 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/velocity/engine/1.7/velocity-1.7.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e58293ce156e06a7e24473195387d921
+_md5_=78a3f10cc9c5f7bdddaf44bfd176a9fc
diff --git a/metadata/md5-cache/dev-java/velocity-dvsl-1.0 b/metadata/md5-cache/dev-java/velocity-dvsl-1.0
index 28f38ebcff8b..66f3e81ad1d8 100644
--- a/metadata/md5-cache/dev-java/velocity-dvsl-1.0
+++ b/metadata/md5-cache/dev-java/velocity-dvsl-1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Declarative Velocity Style Language.
 EAPI=5
 HOMEPAGE=http://velocity.apache.org/dvsl/devel/
 IUSE=elibc_FreeBSD doc source examples elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-java/ant-core:0 dev-java/dom4j:1 dev-java/velocity:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://apache/velocity/dvsl/1.0/velocity-dvsl-1.0-src.zip -> velocity-dvsl-1.0.zip
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=19d2489c69767f0a2d8f4a30cbb97f8f
+_md5_=79972633d8383e7db9a041bcd4b003a6
diff --git a/metadata/md5-cache/dev-lang/rebol-bin-3_pre111 b/metadata/md5-cache/dev-lang/rebol-bin-3_pre111
index d79bc0287b17..b21b8f21315c 100644
--- a/metadata/md5-cache/dev-lang/rebol-bin-3_pre111
+++ b/metadata/md5-cache/dev-lang/rebol-bin-3_pre111
@@ -7,4 +7,4 @@ LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=http://www.rebol.com/r3/downloads/r3-a111-4-4.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
-_md5_=73ba5aff961f3123b6bb910abab0ad74
+_md5_=da779e090cc6abc5ae116e54ce18a149
diff --git a/metadata/md5-cache/dev-lang/rebol-bin-3_pre20140304 b/metadata/md5-cache/dev-lang/rebol-bin-3_pre20140304
new file mode 100644
index 000000000000..9238f131836c
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rebol-bin-3_pre20140304
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Relative Expression-Based Object Language
+EAPI=6
+HOMEPAGE=http://rebol.com
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=amd64? ( http://rebolsource.net/downloads/experimental/r3-linux-x64-gbf237fc ) x86? ( http://rebolsource.net/downloads/linux-x86/r3-g25033f8 )
+_md5_=1bc998a9adf57aecb74524df7f9071d3
diff --git a/metadata/md5-cache/dev-libs/hyphen-2.8.6 b/metadata/md5-cache/dev-libs/hyphen-2.8.6
index b67dfce6b858..74e984fe3710 100644
--- a/metadata/md5-cache/dev-libs/hyphen-2.8.6
+++ b/metadata/md5-cache/dev-libs/hyphen-2.8.6
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure install
 DEPEND=app-text/hunspell dev-lang/perl
 DESCRIPTION=ALTLinux hyphenation library
 EAPI=4
-HOMEPAGE=http://hunspell.sf.net
+HOMEPAGE=http://hunspell.github.io/
 IUSE=static-libs
 KEYWORDS=amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1 MPL-1.1
 RDEPEND=app-text/hunspell
 SLOT=0
 SRC_URI=mirror://sourceforge/hunspell/hyphen-2.8.6.tar.gz
-_md5_=6fb482e8e35bbc075af3e4e9d34bf542
+_md5_=78c84bd52b83d4e46ffe2609e181d810
diff --git a/metadata/md5-cache/dev-libs/hyphen-2.8.8 b/metadata/md5-cache/dev-libs/hyphen-2.8.8
index 538856601f72..e2bc2ceebcb6 100644
--- a/metadata/md5-cache/dev-libs/hyphen-2.8.8
+++ b/metadata/md5-cache/dev-libs/hyphen-2.8.8
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install
 DEPEND=app-text/hunspell dev-lang/perl
 DESCRIPTION=ALTLinux hyphenation library
-EAPI=4
-HOMEPAGE=http://hunspell.sf.net
+EAPI=6
+HOMEPAGE=http://hunspell.github.io/
 IUSE=static-libs
 KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1 MPL-1.1
 RDEPEND=app-text/hunspell
 SLOT=0
 SRC_URI=mirror://sourceforge/hunspell/hyphen-2.8.8.tar.gz
-_md5_=71ca58b4624492b1b8f341226e6aab1d
+_md5_=5b327e454a79bbcbd4a184ea4b45bcc8
diff --git a/metadata/md5-cache/dev-perl/Context-Preserve-0.10.0-r1 b/metadata/md5-cache/dev-perl/Context-Preserve-0.10.0-r1
index 744a8758e23b..9d429d021389 100644
--- a/metadata/md5-cache/dev-perl/Context-Preserve-0.10.0-r1
+++ b/metadata/md5-cache/dev-perl/Context-Preserve-0.10.0-r1
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-perl/Test-Exception || ( >=virtual/perl-Test-Simple-1.1.10 dev-perl/Test-use-ok ) ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=Pass chained return values from subs, modifying their values, without losing context
+DEPEND=test? ( dev-perl/Test-Exception >=virtual/perl-Test-Simple-1.1.10 ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=Return chained, modified values from subs, without losing context
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Context-Preserve/
 IUSE=test
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JR/JROCKWAY/Context-Preserve-0.01.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=46ff4d3286aafcef81a127c6bc90cdfe
+_md5_=25c838b8dcdcd2b8f735f9a6f2c44f35
diff --git a/metadata/md5-cache/dev-perl/DBICx-TestDatabase-0.40.0 b/metadata/md5-cache/dev-perl/DBICx-TestDatabase-0.40.0
index d4f55c9f15d3..fe87dbf51948 100644
--- a/metadata/md5-cache/dev-perl/DBICx-TestDatabase-0.40.0
+++ b/metadata/md5-cache/dev-perl/DBICx-TestDatabase-0.40.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-File-Temp >=dev-perl/DBD-SQLite-1.29 dev-perl/SQL-Translator test? ( dev-perl/DBIx-Class virtual/perl-Test-Simple || ( >=virtual/perl-Test-Simple-1.1.10 dev-perl/Test-use-ok ) ) dev-lang/perl:=[-build(-)]
+DEPEND=virtual/perl-File-Temp >=dev-perl/DBD-SQLite-1.29 dev-perl/SQL-Translator test? ( dev-perl/DBIx-Class virtual/perl-Test-Simple >=virtual/perl-Test-Simple-1.1.10 ) dev-lang/perl:=[-build(-)]
 DESCRIPTION=create a temporary database from a DBIx::Class::Schema
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/DBICx-TestDatabase/
@@ -10,4 +10,4 @@ RDEPEND=virtual/perl-File-Temp >=dev-perl/DBD-SQLite-1.29 dev-perl/SQL-Translato
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JR/JROCKWAY/DBICx-TestDatabase-0.04.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=d85ae1ef799b9f00c69469e55b22176a
+_md5_=9c7c1a9442dc4d2fba4e4fada2d9d1a6
diff --git a/metadata/md5-cache/dev-perl/Devel-ArgNames-0.30.0-r1 b/metadata/md5-cache/dev-perl/Devel-ArgNames-0.30.0-r1
index 44b7b0fccd10..e631934cf8f8 100644
--- a/metadata/md5-cache/dev-perl/Devel-ArgNames-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Devel-ArgNames-0.30.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/PadWalker test? ( || ( >=virtual/perl-Test-Simple-1.1.10 dev-perl/Test-use-ok ) ) dev-lang/perl:=[-build(-)]
+DEPEND=dev-perl/PadWalker test? ( >=virtual/perl-Test-Simple-1.1.10 ) dev-lang/perl:=[-build(-)]
 DESCRIPTION=Figure out the names of variables passed into subroutines
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Devel-ArgNames/
@@ -10,4 +10,4 @@ RDEPEND=dev-perl/PadWalker dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NU/NUFFIN/Devel-ArgNames-0.03.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=41f9afeb6f27defd3827cd824b532f1b
+_md5_=324bf2fef8c1f19900225434624cb0eb
diff --git a/metadata/md5-cache/dev-perl/IO-Handle-Util-0.10.0 b/metadata/md5-cache/dev-perl/IO-Handle-Util-0.10.0
index c2c10b77099a..dc083c702022 100644
--- a/metadata/md5-cache/dev-perl/IO-Handle-Util-0.10.0
+++ b/metadata/md5-cache/dev-perl/IO-Handle-Util-0.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/IO-String virtual/perl-Scalar-List-Utils dev-perl/Sub-Exporter dev-perl/asa virtual/perl-parent virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.880.0 || ( >=virtual/perl-Test-Simple-1.1.10 ( <virtual/perl-Test-Simple-1.1.10 dev-perl/Test-use-ok ) ) ) dev-lang/perl:=
+DEPEND=dev-perl/IO-String virtual/perl-Scalar-List-Utils dev-perl/Sub-Exporter dev-perl/asa virtual/perl-parent virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-1.1.10 ) dev-lang/perl:=
 DESCRIPTION=Functions for working with IO::Handle like objects
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/IO-Handle-Util/
@@ -10,4 +10,4 @@ RDEPEND=dev-perl/IO-String virtual/perl-Scalar-List-Utils dev-perl/Sub-Exporter
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NU/NUFFIN/IO-Handle-Util-0.01.tar.gz
 _eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce
-_md5_=d17cb84eca67f9b45ab2fb05cb335878
+_md5_=1789c05647c38d654bcb619384a460c5
diff --git a/metadata/md5-cache/dev-perl/MooseX-Types-DateTime-0.130.0 b/metadata/md5-cache/dev-perl/MooseX-Types-DateTime-0.130.0
index d6081c2902ab..c1b42e6e0d15 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Types-DateTime-0.130.0
+++ b/metadata/md5-cache/dev-perl/MooseX-Types-DateTime-0.130.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/DateTime-0.430.200 >=dev-perl/DateTime-Locale-0.400.100 >=dev-perl/DateTime-TimeZone-0.950.0 >=dev-perl/Moose-0.410.0 >=dev-perl/MooseX-Types-0.300.0 >=dev-perl/namespace-clean-0.190.0 virtual/perl-if >=dev-perl/Module-Build-Tiny-0.34.0 test? ( virtual/perl-ExtUtils-MakeMaker virtual/perl-File-Spec virtual/perl-Locale-Maketext dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.880.0 || ( >=virtual/perl-Test-Simple-1.1.10 ( <virtual/perl-Test-Simple-1.1.10 >=dev-perl/Test-use-ok-0.20.0 ) ) ) dev-lang/perl:=
+DEPEND=>=dev-perl/DateTime-0.430.200 >=dev-perl/DateTime-Locale-0.400.100 >=dev-perl/DateTime-TimeZone-0.950.0 >=dev-perl/Moose-0.410.0 >=dev-perl/MooseX-Types-0.300.0 >=dev-perl/namespace-clean-0.190.0 virtual/perl-if >=dev-perl/Module-Build-Tiny-0.34.0 test? ( virtual/perl-ExtUtils-MakeMaker virtual/perl-File-Spec virtual/perl-Locale-Maketext dev-perl/Test-Fatal >=virtual/perl-Test-Simple-1.1.10 ) dev-lang/perl:=
 DESCRIPTION=DateTime related constraints and coercions for Moose
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/MooseX-Types-DateTime/
@@ -10,4 +10,4 @@ RDEPEND=>=dev-perl/DateTime-0.430.200 >=dev-perl/DateTime-Locale-0.400.100 >=dev
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-DateTime-0.13.tar.gz
 _eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce
-_md5_=f8510ce7f89497abca7f43e997b741bf
+_md5_=40e6d70a70c847f39751edaa7118a6a4
diff --git a/metadata/md5-cache/dev-perl/MooseX-Types-DateTime-ButMaintained-0.160.0 b/metadata/md5-cache/dev-perl/MooseX-Types-DateTime-ButMaintained-0.160.0
index fd374e0ffb74..6b5d4dba2722 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Types-DateTime-ButMaintained-0.160.0
+++ b/metadata/md5-cache/dev-perl/MooseX-Types-DateTime-ButMaintained-0.160.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/DateTime-0.43.02 >=dev-perl/DateTime-Format-DateParse-0.04 >=dev-perl/DateTime-Format-Flexible-0.05 >=dev-perl/DateTime-Format-Natural-0.71 >=dev-perl/DateTime-Locale-0.40.01 >=dev-perl/DateTime-TimeZone-0.77.01 >=dev-perl/DateTimeX-Easy-0.082 >=dev-perl/Moose-0.41 >=dev-perl/MooseX-Types-0.300.0 dev-perl/namespace-autoclean >=dev-perl/Olson-Abbreviations-0.30.0 test? ( >=dev-perl/Test-Exception-0.27 || ( >=virtual/perl-Test-Simple-1.1.10 >=dev-perl/Test-use-ok-0.02 ) >=dev-perl/Time-Duration-Parse-0.06 ) dev-lang/perl:=[-build(-)]
+DEPEND=>=dev-perl/DateTime-0.43.02 >=dev-perl/DateTime-Format-DateParse-0.04 >=dev-perl/DateTime-Format-Flexible-0.05 >=dev-perl/DateTime-Format-Natural-0.71 >=dev-perl/DateTime-Locale-0.40.01 >=dev-perl/DateTime-TimeZone-0.77.01 >=dev-perl/DateTimeX-Easy-0.082 >=dev-perl/Moose-0.41 >=dev-perl/MooseX-Types-0.300.0 dev-perl/namespace-autoclean >=dev-perl/Olson-Abbreviations-0.30.0 test? ( >=dev-perl/Test-Exception-0.27 >=virtual/perl-Test-Simple-1.1.10 >=dev-perl/Time-Duration-Parse-0.06 ) dev-lang/perl:=[-build(-)]
 DESCRIPTION=DateTime related constraints and coercions for Moose
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/MooseX-Types-DateTime-ButMaintained/
@@ -10,4 +10,4 @@ RDEPEND=>=dev-perl/DateTime-0.43.02 >=dev-perl/DateTime-Format-DateParse-0.04 >=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EC/ECARROLL/MooseX-Types-DateTime-ButMaintained-0.16.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=06e55a7bac120a654c6b68875dc17285
+_md5_=458f96a4f17f8793510816db78a000cd
diff --git a/metadata/md5-cache/dev-perl/MooseX-Types-DateTime-MoreCoercions-0.150.0 b/metadata/md5-cache/dev-perl/MooseX-Types-DateTime-MoreCoercions-0.150.0
index 7d24c6ab8b9d..3729a532a2a0 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Types-DateTime-MoreCoercions-0.150.0
+++ b/metadata/md5-cache/dev-perl/MooseX-Types-DateTime-MoreCoercions-0.150.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-perl/DateTime-0.430.200 >=dev-perl/DateTimeX-Easy-0.85.0 >=dev-perl/Moose-0.410.0 >=dev-perl/MooseX-Types-0.40.0 >=dev-perl/MooseX-Types-DateTime-0.70.0 >=dev-perl/Time-Duration-Parse-0.60.0 virtual/perl-if >=dev-perl/namespace-clean-0.190.0 >=dev-perl/Module-Build-Tiny-0.7.0 test? ( virtual/perl-ExtUtils-MakeMaker virtual/perl-File-Spec dev-perl/Test-Fatal || ( >=virtual/perl-Test-Simple-1.1.10 >=dev-perl/Test-use-ok-0.20.0 ) ) dev-lang/perl:=
+DEPEND=>=dev-perl/DateTime-0.430.200 >=dev-perl/DateTimeX-Easy-0.85.0 >=dev-perl/Moose-0.410.0 >=dev-perl/MooseX-Types-0.40.0 >=dev-perl/MooseX-Types-DateTime-0.70.0 >=dev-perl/Time-Duration-Parse-0.60.0 virtual/perl-if >=dev-perl/namespace-clean-0.190.0 >=dev-perl/Module-Build-Tiny-0.7.0 test? ( virtual/perl-ExtUtils-MakeMaker virtual/perl-File-Spec dev-perl/Test-Fatal >=virtual/perl-Test-Simple-1.1.10 ) dev-lang/perl:=
 DESCRIPTION=Extensions to MooseX::Types::DateTime
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/MooseX-Types-DateTime-MoreCoercions/
@@ -10,4 +10,4 @@ RDEPEND=>=dev-perl/DateTime-0.430.200 >=dev-perl/DateTimeX-Easy-0.85.0 >=dev-per
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-DateTime-MoreCoercions-0.15.tar.gz
 _eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce
-_md5_=1e6972195f77a48840413114c506576c
+_md5_=704252077d80cd80af4627a14f0c9f15
diff --git a/metadata/md5-cache/dev-perl/MooseX-Types-DateTimeX-0.100.0 b/metadata/md5-cache/dev-perl/MooseX-Types-DateTimeX-0.100.0
index 275d4fb55aff..fade9f843ab6 100644
--- a/metadata/md5-cache/dev-perl/MooseX-Types-DateTimeX-0.100.0
+++ b/metadata/md5-cache/dev-perl/MooseX-Types-DateTimeX-0.100.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-perl/DateTimeX-Easy-0.85.0 >=dev-perl/Moose-0.410.0 >=dev-perl/MooseX-Types-0.40.0 >=dev-perl/MooseX-Types-DateTime-ButMaintained-0.40.0 >=dev-perl/Time-Duration-Parse-0.60.0 >=dev-perl/namespace-clean-0.80.0 >=virtual/perl-ExtUtils-MakeMaker-6.420.0 test? ( || ( >=virtual/perl-Test-Simple-1.1.10 >=dev-perl/Test-use-ok-0.20.0 ) >=dev-perl/Test-Exception-0.270.0 virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
+DEPEND=>=dev-perl/DateTimeX-Easy-0.85.0 >=dev-perl/Moose-0.410.0 >=dev-perl/MooseX-Types-0.40.0 >=dev-perl/MooseX-Types-DateTime-ButMaintained-0.40.0 >=dev-perl/Time-Duration-Parse-0.60.0 >=dev-perl/namespace-clean-0.80.0 >=virtual/perl-ExtUtils-MakeMaker-6.420.0 test? ( >=virtual/perl-Test-Simple-1.1.10 >=dev-perl/Test-Exception-0.270.0 ) dev-lang/perl:=[-build(-)]
 DESCRIPTION=Extensions to MooseX::Types::DateTime::ButMaintained
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/MooseX-Types-DateTimeX/
@@ -10,4 +10,4 @@ RDEPEND=>=dev-perl/DateTimeX-Easy-0.85.0 >=dev-perl/Moose-0.410.0 >=dev-perl/Moo
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/EC/ECARROLL/MooseX-Types-DateTimeX-0.10.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=f54a0c12a915dc9838488703382a46f4
+_md5_=a62542955fee6127ba27c74bf1509667
diff --git a/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1 b/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1
index 7e9a3636a2d5..74ea0b01c5d8 100644
--- a/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1
+++ b/metadata/md5-cache/dev-perl/Tie-ToObject-0.30.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( || ( >=virtual/perl-Test-Simple-1.1.10 dev-perl/Test-use-ok ) ) dev-lang/perl:=[-build(-)]
+DEPEND=test? ( >=virtual/perl-Test-Simple-1.1.10 ) dev-lang/perl:=[-build(-)]
 DESCRIPTION=Tie to an existing object
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Tie-ToObject/
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NU/NUFFIN/Tie-ToObject-0.03.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=9c4fbf8c3d60cef4674690f287cba0c0
+_md5_=13b233e294707f5e08ab3715a6d350e3
diff --git a/metadata/md5-cache/dev-php/adodb-5.20.4 b/metadata/md5-cache/dev-php/adodb-5.20.4
new file mode 100644
index 000000000000..1b4516a9b711
--- /dev/null
+++ b/metadata/md5-cache/dev-php/adodb-5.20.4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Database abstraction layer for PHP
+EAPI=6
+HOMEPAGE=http://www.adodb.org/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD LGPL-2.1
+RDEPEND=dev-lang/php:*
+SLOT=0
+SRC_URI=https://github.com/ADOdb/ADOdb/archive/v5.20.4.tar.gz
+_md5_=4fc47e06b6440760f6c3473592a01bef
diff --git a/metadata/md5-cache/dev-python/botocore-1.4.27 b/metadata/md5-cache/dev-python/botocore-1.4.34
similarity index 99%
rename from metadata/md5-cache/dev-python/botocore-1.4.27
rename to metadata/md5-cache/dev-python/botocore-1.4.34
index ddadf3926cb3..c6a91ba98e0f 100644
--- a/metadata/md5-cache/dev-python/botocore-1.4.27
+++ b/metadata/md5-cache/dev-python/botocore-1.4.34
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-python/docutils-0.10[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jmespath-0.7.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/jmespath-1.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/python-dateutil-2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] <dev-python/python-dateutil-3.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
-SRC_URI=mirror://pypi/b/botocore/botocore-1.4.27.tar.gz
+SRC_URI=mirror://pypi/b/botocore/botocore-1.4.34.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a2d1740279b122c012394f9f2c9deadb
diff --git a/metadata/md5-cache/dev-python/docker-py-1.8.0_rc2 b/metadata/md5-cache/dev-python/docker-py-1.9.0_rc2
similarity index 68%
rename from metadata/md5-cache/dev-python/docker-py-1.8.0_rc2
rename to metadata/md5-cache/dev-python/docker-py-1.9.0_rc2
index d0d59b89a6c7..054ca6522c76 100644
--- a/metadata/md5-cache/dev-python/docker-py-1.8.0_rc2
+++ b/metadata/md5-cache/dev-python/docker-py-1.9.0_rc2
@@ -6,9 +6,9 @@ HOMEPAGE=https://github.com/docker/docker-py
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/requests-2.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+RDEPEND=>=dev-python/requests-2.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_3? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( >=dev-python/backports-ssl-match-hostname-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-python/ipaddress-1.0.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
-SRC_URI=https://github.com/docker/docker-py/archive/1.8.0-rc2.tar.gz -> docker-py-1.8.0_rc2.tar.gz
+SRC_URI=https://github.com/docker/docker-py/archive/1.9.0-rc2.tar.gz -> docker-py-1.9.0_rc2.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1f1a590195adae6dcfb3bf323f5906dd
+_md5_=3672f9b7ea480557ca2453c4bf9f60a9
diff --git a/metadata/md5-cache/dev-python/nose2-0.6.5 b/metadata/md5-cache/dev-python/nose2-0.6.5
new file mode 100644
index 000000000000..6f5b6b207828
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nose2-0.6.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( >=dev-python/sphinx-1.0.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=nose2 is the next generation of nicer testing for Python
+EAPI=5
+HOMEPAGE=https://github.com/nose-devs/nose2
+IUSE=doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cov-core-1.12[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/nose-devs/nose2/archive/0.6.5.tar.gz -> nose2-0.6.5.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=9d6117e3cf4b3176157d3f7c7061e632
diff --git a/metadata/md5-cache/dev-python/python-zipstream-1.1.4 b/metadata/md5-cache/dev-python/python-zipstream-1.1.4
new file mode 100644
index 000000000000..361c11cd1b23
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-zipstream-1.1.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
+DESCRIPTION=A zip archive generator
+EAPI=6
+HOMEPAGE=https://github.com/allanlei/python-zipstream
+IUSE=test python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/allanlei/python-zipstream/archive/v1.1.4.tar.gz -> python-zipstream-1.1.4.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=458e7b8b09a295348279f5b7bc292a71
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.1.8 b/metadata/md5-cache/dev-python/setproctitle-1.1.8
index cab972febadf..9624c24432ac 100644
--- a/metadata/md5-cache/dev-python/setproctitle-1.1.8
+++ b/metadata/md5-cache/dev-python/setproctitle-1.1.8
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Allow customization of the process title
 EAPI=5
-HOMEPAGE=https://code.google.com/p/py-setproctitle/ https://pypi.python.org/pypi/setproctitle
+HOMEPAGE=https://github.com/dvarrazzo/py-setproctitle
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 SLOT=0
 SRC_URI=mirror://pypi/s/setproctitle/setproctitle-1.1.8.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ec30837a86b055631e068b0a29777ab3
+_md5_=d8329fc6e9622406a5fe2a833d8c4d7a
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.1.9 b/metadata/md5-cache/dev-python/setproctitle-1.1.9
index a85502ad0026..9f498a7bb36d 100644
--- a/metadata/md5-cache/dev-python/setproctitle-1.1.9
+++ b/metadata/md5-cache/dev-python/setproctitle-1.1.9
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Allow customization of the process title
 EAPI=5
-HOMEPAGE=https://code.google.com/p/py-setproctitle/ https://pypi.python.org/pypi/setproctitle
+HOMEPAGE=https://github.com/dvarrazzo/py-setproctitle
 IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_py
 SLOT=0
 SRC_URI=mirror://pypi/s/setproctitle/setproctitle-1.1.9.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=7d854000255a9ea5ba8b3bef907cf253
+_md5_=17b311aec00f173d006e0f5e93652c48
diff --git a/metadata/md5-cache/dev-python/stormpath-2.1.6 b/metadata/md5-cache/dev-python/stormpath-2.4.1
similarity index 98%
rename from metadata/md5-cache/dev-python/stormpath-2.1.6
rename to metadata/md5-cache/dev-python/stormpath-2.4.1
index 6c1f11a2058b..5d61533d8b7a 100644
--- a/metadata/md5-cache/dev-python/stormpath-2.1.6
+++ b/metadata/md5-cache/dev-python/stormpath-2.4.1
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=>=dev-python/isodate-0.5.4[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/oauthlib-0.6.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pydispatcher-2.0.5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/pyjwt-1.0.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-dateutil-2.4.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.4.3[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/six-1.6.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
-SRC_URI=https://github.com/stormpath/stormpath-sdk-python/archive/2.1.6.tar.gz -> stormpath-2.1.6.tar.gz
+SRC_URI=https://github.com/stormpath/stormpath-sdk-python/archive/2.4.1.tar.gz -> stormpath-2.4.1.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=2425b90b4859ad449e9876cbcf9eb65f
+_md5_=fa5af47455b6dd552625f05a30d0f794
diff --git a/metadata/md5-cache/dev-vcs/git-2.9.0 b/metadata/md5-cache/dev-vcs/git-2.9.2
similarity index 91%
rename from metadata/md5-cache/dev-vcs/git-2.9.0
rename to metadata/md5-cache/dev-vcs/git-2.9.2
index e37d922277ec..bef1d4ae79a2 100644
--- a/metadata/md5-cache/dev-vcs/git-2.9.0
+++ b/metadata/md5-cache/dev-vcs/git-2.9.2
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
 SLOT=0
-SRC_URI=https://git-core.googlecode.com/files/git-2.9.0.tar.xz mirror://kernel/software/scm/git/git-2.9.0.tar.xz https://git-core.googlecode.com/files/git-manpages-2.9.0.tar.xz mirror://kernel/software/scm/git/git-manpages-2.9.0.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.9.0.tar.xz https://git-core.googlecode.com/files/git-htmldocs-2.9.0.tar.xz )
+SRC_URI=https://git-core.googlecode.com/files/git-2.9.2.tar.xz mirror://kernel/software/scm/git/git-2.9.2.tar.xz https://git-core.googlecode.com/files/git-manpages-2.9.2.tar.xz mirror://kernel/software/scm/git/git-manpages-2.9.2.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.9.2.tar.xz https://git-core.googlecode.com/files/git-htmldocs-2.9.2.tar.xz )
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	792f83d5ec9536cb5ccef375469d8bde	l10n	e26ea0642846685782f1813642e7ff0f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
 _md5_=b58cdb37bd78d2cdc2da86bd92f95fba
diff --git a/metadata/md5-cache/games-action/beathazardultra-20130308-r1 b/metadata/md5-cache/games-action/beathazardultra-20130308-r1
new file mode 100644
index 000000000000..f5c2eef51ad4
--- /dev/null
+++ b/metadata/md5-cache/games-action/beathazardultra-20130308-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch prepare unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Intense music-driven arcade shooter powered by your music
+EAPI=6
+HOMEPAGE=http://www.coldbeamgames.com/
+IUSE=bundled-libs
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=virtual/opengl amd64? ( !bundled-libs? ( >=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)] >=virtual/jpeg-0-r2[abi_x86_32(-)] ) >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] ) x86? ( x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXrandr !bundled-libs? ( media-libs/libpng:1.2 virtual/jpeg ) )
+RESTRICT=bindist fetch splitdebug
+SLOT=0
+SRC_URI=beathazard-installer_03-08-13
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	unpacker	45d07319df5f40ee6af58418b0f930be
+_md5_=c1a38598b3267d38ae23cfa413a5ed79
diff --git a/metadata/md5-cache/games-action/bomberclone-0.11.8-r1 b/metadata/md5-cache/games-action/bomberclone-0.11.8-r1
new file mode 100644
index 000000000000..930f7cb33d75
--- /dev/null
+++ b/metadata/md5-cache/games-action/bomberclone-0.11.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=media-libs/libsdl-1.1.0[video] media-libs/sdl-image[png] media-libs/sdl-mixer[mod] X? ( x11-libs/libXt ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=BomberMan clone with network game support
+EAPI=6
+HOMEPAGE=http://www.bomberclone.de/
+IUSE=X
+KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libsdl-1.1.0[video] media-libs/sdl-image[png] media-libs/sdl-mixer[mod] X? ( x11-libs/libXt )
+SLOT=0
+SRC_URI=mirror://sourceforge/bomberclone/bomberclone-0.11.8.tar.bz2
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
+_md5_=37e23eeadec9ed59d5c07a7fd013a3c8
diff --git a/metadata/md5-cache/games-action/brutal-legend-20130615-r2 b/metadata/md5-cache/games-action/brutal-legend-20130615-r2
new file mode 100644
index 000000000000..084cf289d06e
--- /dev/null
+++ b/metadata/md5-cache/games-action/brutal-legend-20130615-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=Unleash the power of Heavy Metal to reign down fire from the sky
+EAPI=6
+HOMEPAGE=https://www.ea.com/de/brutal-legend
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=amd64? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)] ) x86? ( sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libxcb )
+RESTRICT=bindist fetch splitdebug
+SLOT=0
+SRC_URI=BrutalLegend-Linux-2013-06-15-setup.bin
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	unpacker	45d07319df5f40ee6af58418b0f930be	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=9a1691d795041cf4856c73042788a57a
diff --git a/metadata/md5-cache/media-libs/opencollada-1.6.23 b/metadata/md5-cache/media-libs/opencollada-1.6.25
similarity index 91%
rename from metadata/md5-cache/media-libs/opencollada-1.6.23
rename to metadata/md5-cache/media-libs/opencollada-1.6.25
index fbe5ff7b7db6..54e22c3fc92d 100644
--- a/metadata/md5-cache/media-libs/opencollada-1.6.23
+++ b/metadata/md5-cache/media-libs/opencollada-1.6.25
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/libpcre dev-libs/zziplib media-libs/lib3ds sys-libs/zlib expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2 )
 SLOT=0
-SRC_URI=https://github.com/KhronosGroup/OpenCOLLADA/archive/v1.6.23.tar.gz -> opencollada-1.6.23.tar.gz
+SRC_URI=https://github.com/KhronosGroup/OpenCOLLADA/archive/v1.6.25.tar.gz -> opencollada-1.6.25.tar.gz
 _eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0c6db7ab33977271c181b2622f6cbeba
+_md5_=f89ed9a215c274d2d49114f13dd988dd
diff --git a/metadata/md5-cache/media-sound/clementine-1.2.3 b/metadata/md5-cache/media-sound/clementine-1.2.3
index 4eeb2f74f146..aa89c45d07f7 100644
--- a/metadata/md5-cache/media-sound/clementine-1.2.3
+++ b/metadata/md5-cache/media-sound/clementine-1.2.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-crypt/qca:2[qt4(+)] >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 dbus? ( >=dev-qt/qtdbus-4.5:4 ) >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4[sqlite] system-sqlite? ( dev-db/sqlite:3[fts3(+)] ) >=media-libs/taglib-1.8[mp4] >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson media-libs/libechonest:= >=media-libs/libmygpo-qt-1.0.7 >=media-libs/chromaprint-0.6 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 ayatana? ( dev-libs/libindicate-qt ) cdda? ( dev-libs/libcdio ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= ) >=dev-libs/boost-1.39 virtual/pkgconfig sys-devel/gettext dev-qt/qttest:4 dev-cpp/gmock box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) ubuntu-one? ( dev-cpp/sparsehash ) test? ( gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-crypt/qca:2[qt4(+)] >=dev-qt/qtcore-4.5:4[ssl] >=dev-qt/qtgui-4.5:4 dbus? ( >=dev-qt/qtdbus-4.5:4 ) >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4[sqlite] system-sqlite? ( dev-db/sqlite:3[fts3(+)] ) >=media-libs/taglib-1.8[mp4] >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson media-libs/libechonest:= >=media-libs/libmygpo-qt-1.0.7 >=media-libs/chromaprint-0.6 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 ayatana? ( dev-libs/libindicate-qt ) cdda? ( dev-libs/libcdio ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= ) >=dev-libs/boost-1.39 virtual/pkgconfig sys-devel/gettext dev-qt/qttest:4 dev-cpp/gmock box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) ubuntu-one? ( dev-cpp/sparsehash ) test? ( gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=A modern music player and library organizer based on Amarok 1.4 and Qt4
 EAPI=5
 HOMEPAGE=http://www.clementine-player.org https://github.com/clementine-player/Clementine
 IUSE=ayatana box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive system-sqlite test ubuntu-one +udisks wiimote linguas_af linguas_ar linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_es_AR linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_lv linguas_mr linguas_ms linguas_nb linguas_nl linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_te linguas_tr linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW test
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=app-crypt/qca:2[qt4(+)] >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 dbus? ( >=dev-qt/qtdbus-4.5:4 ) >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4[sqlite] system-sqlite? ( dev-db/sqlite:3[fts3(+)] ) >=media-libs/taglib-1.8[mp4] >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson media-libs/libechonest:= >=media-libs/libmygpo-qt-1.0.7 >=media-libs/chromaprint-0.6 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 ayatana? ( dev-libs/libindicate-qt ) cdda? ( dev-libs/libcdio ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= ) dbus? ( udisks? ( sys-fs/udisks:2 ) ) mms? ( media-plugins/gst-plugins-libmms:0.10 ) mtp? ( gnome-base/gvfs ) projectm? ( >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:0.10 media-plugins/gst-plugins-gio:0.10 media-plugins/gst-plugins-soup:0.10 media-plugins/gst-plugins-taglib:0.10
+RDEPEND=app-crypt/qca:2[qt4(+)] >=dev-qt/qtcore-4.5:4[ssl] >=dev-qt/qtgui-4.5:4 dbus? ( >=dev-qt/qtdbus-4.5:4 ) >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4[sqlite] system-sqlite? ( dev-db/sqlite:3[fts3(+)] ) >=media-libs/taglib-1.8[mp4] >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson media-libs/libechonest:= >=media-libs/libmygpo-qt-1.0.7 >=media-libs/chromaprint-0.6 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 ayatana? ( dev-libs/libindicate-qt ) cdda? ( dev-libs/libcdio ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= ) dbus? ( udisks? ( sys-fs/udisks:2 ) ) mms? ( media-plugins/gst-plugins-libmms:0.10 ) mtp? ( gnome-base/gvfs ) projectm? ( >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:0.10 media-plugins/gst-plugins-gio:0.10 media-plugins/gst-plugins-soup:0.10 media-plugins/gst-plugins-taglib:0.10
 REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/clementine-player/Clementine/archive/1.2.3.tar.gz -> clementine-1.2.3.tar.gz
 _eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1a0c81a694355afcf6f46ca152cf9691
+_md5_=adb633a24f71be74a8feec80c2547371
diff --git a/metadata/md5-cache/media-sound/clementine-1.2.3-r1 b/metadata/md5-cache/media-sound/clementine-1.2.3-r1
deleted file mode 100644
index 77099054e4f7..000000000000
--- a/metadata/md5-cache/media-sound/clementine-1.2.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-crypt/qca:2[qt4(+)] >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 dbus? ( >=dev-qt/qtdbus-4.5:4 ) >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4[sqlite] system-sqlite? ( dev-db/sqlite:3[fts3(+)] ) >=media-libs/taglib-1.8[mp4] >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson media-libs/libechonest:= >=media-libs/libmygpo-qt-1.0.7 >=media-libs/chromaprint-0.6 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 ayatana? ( dev-libs/libindicate-qt ) cdda? ( dev-libs/libcdio ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= ) >=dev-libs/boost-1.39:= virtual/pkgconfig sys-devel/gettext dev-qt/qttest:4 dev-cpp/gmock box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) ubuntu-one? ( dev-cpp/sparsehash ) test? ( gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A modern music player and library organizer based on Amarok 1.4 and Qt4
-EAPI=5
-HOMEPAGE=http://www.clementine-player.org https://github.com/clementine-player/Clementine
-IUSE=ayatana box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive system-sqlite test ubuntu-one +udisks wiimote linguas_af linguas_ar linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_es_AR linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_lv linguas_mr linguas_ms linguas_nb linguas_nl linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_te linguas_tr linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-crypt/qca:2[qt4(+)] >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 dbus? ( >=dev-qt/qtdbus-4.5:4 ) >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4[sqlite] system-sqlite? ( dev-db/sqlite:3[fts3(+)] ) >=media-libs/taglib-1.8[mp4] >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson media-libs/libechonest:= >=media-libs/libmygpo-qt-1.0.7 >=media-libs/chromaprint-0.6 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 ayatana? ( dev-libs/libindicate-qt ) cdda? ( dev-libs/libcdio ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= ) dbus? ( udisks? ( sys-fs/udisks:0 ) ) mms? ( media-plugins/gst-plugins-libmms:0.10 ) mtp? ( gnome-base/gvfs ) projectm? ( >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:0.10 media-plugins/gst-plugins-gio:0.10 media-plugins/gst-plugins-soup:0.10 media-plugins/gst-plugins-taglib:0.10
-REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/clementine-player/Clementine/archive/1.2.3.tar.gz -> clementine-1.2.3.tar.gz
-_eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=0442b08075f65c4d9cea7ffedd40473a
diff --git a/metadata/md5-cache/media-sound/clementine-1.2.3-r2 b/metadata/md5-cache/media-sound/clementine-1.2.3-r2
new file mode 100644
index 000000000000..26ac028de809
--- /dev/null
+++ b/metadata/md5-cache/media-sound/clementine-1.2.3-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-crypt/qca:2[qt4(+)] >=dev-qt/qtcore-4.5:4[ssl] >=dev-qt/qtgui-4.5:4 dbus? ( >=dev-qt/qtdbus-4.5:4 ) >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4[sqlite] system-sqlite? ( dev-db/sqlite:3[fts3(+)] ) >=media-libs/taglib-1.8[mp4] >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson media-libs/libechonest:= >=media-libs/libmygpo-qt-1.0.7 >=media-libs/chromaprint-0.6 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 ayatana? ( dev-libs/libindicate-qt ) cdda? ( dev-libs/libcdio ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= ) >=dev-libs/boost-1.39:= virtual/pkgconfig sys-devel/gettext dev-qt/qttest:4 dev-cpp/gmock box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) ubuntu-one? ( dev-cpp/sparsehash ) test? ( gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A modern music player and library organizer based on Amarok 1.4 and Qt4
+EAPI=5
+HOMEPAGE=http://www.clementine-player.org https://github.com/clementine-player/Clementine
+IUSE=ayatana box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive system-sqlite test ubuntu-one +udisks wiimote linguas_af linguas_ar linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_es_AR linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_lv linguas_mr linguas_ms linguas_nb linguas_nl linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_te linguas_tr linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-crypt/qca:2[qt4(+)] >=dev-qt/qtcore-4.5:4[ssl] >=dev-qt/qtgui-4.5:4 dbus? ( >=dev-qt/qtdbus-4.5:4 ) >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4[sqlite] system-sqlite? ( dev-db/sqlite:3[fts3(+)] ) >=media-libs/taglib-1.8[mp4] >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson media-libs/libechonest:= >=media-libs/libmygpo-qt-1.0.7 >=media-libs/chromaprint-0.6 media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 ayatana? ( dev-libs/libindicate-qt ) cdda? ( dev-libs/libcdio ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= ) dbus? ( udisks? ( sys-fs/udisks:0 ) ) mms? ( media-plugins/gst-plugins-libmms:0.10 ) mtp? ( gnome-base/gvfs[mtp] ) projectm? ( >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:0.10 media-plugins/gst-plugins-gio:0.10 media-plugins/gst-plugins-soup:0.10 media-plugins/gst-plugins-taglib:0.10
+REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/clementine-player/Clementine/archive/1.2.3.tar.gz -> clementine-1.2.3.tar.gz
+_eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=5012c893a8e747ccce3c42154f553b4c
diff --git a/metadata/md5-cache/media-sound/clementine-1.3.1-r1 b/metadata/md5-cache/media-sound/clementine-1.3.1-r1
deleted file mode 100644
index 2003f5e64bd0..000000000000
--- a/metadata/md5-cache/media-sound/clementine-1.3.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-db/sqlite:= >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4 >=media-libs/chromaprint-0.6 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libechonest:=[qt4] >=media-libs/libmygpo-qt-1.0.8 >=media-libs/taglib-1.8[mp4] sys-libs/zlib dev-libs/crypto++ virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio ) dbus? ( >=dev-qt/qtdbus-4.5:4 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) >=dev-libs/boost-1.39:= virtual/pkgconfig sys-devel/gettext dev-qt/qttest:4 dev-cpp/gmock amazoncloud? ( dev-cpp/sparsehash ) box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) pulseaudio? ( media-sound/pulseaudio ) skydrive? ( dev-cpp/sparsehash ) test? ( gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A modern music player and library organizer based on Amarok 1.4 and Qt4
-EAPI=6
-HOMEPAGE=http://www.clementine-player.org https://github.com/clementine-player/Clementine
-IUSE=amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive test +udisks vkontakte wiimote linguas_af linguas_ar linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_he_IL linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_lv linguas_mr linguas_ms linguas_my linguas_nb linguas_nl linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_si_LK linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_te linguas_tr linguas_tr_TR linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-db/sqlite:= >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4 >=media-libs/chromaprint-0.6 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libechonest:=[qt4] >=media-libs/libmygpo-qt-1.0.8 >=media-libs/taglib-1.8[mp4] sys-libs/zlib dev-libs/crypto++ virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio ) dbus? ( >=dev-qt/qtdbus-4.5:4 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) dbus? ( udisks? ( sys-fs/udisks:0 ) ) mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0
-REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
-SLOT=0
-SRC_URI=https://github.com/clementine-player/Clementine/archive/1.3.1.tar.gz -> clementine-1.3.1.tar.gz
-_eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=581bdacecc10f95b9ef8223d10a896d1
diff --git a/metadata/md5-cache/media-sound/clementine-1.3.1-r2 b/metadata/md5-cache/media-sound/clementine-1.3.1-r2
new file mode 100644
index 000000000000..8ccae9783cd5
--- /dev/null
+++ b/metadata/md5-cache/media-sound/clementine-1.3.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-db/sqlite:= >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson >=dev-qt/qtcore-4.5:4[ssl] >=dev-qt/qtgui-4.5:4 >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4 >=media-libs/chromaprint-0.6 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libechonest:=[qt4] >=media-libs/libmygpo-qt-1.0.8 >=media-libs/taglib-1.8[mp4] sys-libs/zlib dev-libs/crypto++ virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio ) dbus? ( >=dev-qt/qtdbus-4.5:4 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) >=dev-libs/boost-1.39:= virtual/pkgconfig sys-devel/gettext dev-qt/qttest:4 dev-cpp/gmock amazoncloud? ( dev-cpp/sparsehash ) box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) pulseaudio? ( media-sound/pulseaudio ) skydrive? ( dev-cpp/sparsehash ) test? ( gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A modern music player and library organizer based on Amarok 1.4 and Qt4
+EAPI=6
+HOMEPAGE=http://www.clementine-player.org https://github.com/clementine-player/Clementine
+IUSE=amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive test +udisks vkontakte wiimote linguas_af linguas_ar linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_he_IL linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_lv linguas_mr linguas_ms linguas_my linguas_nb linguas_nl linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_si_LK linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_te linguas_tr linguas_tr_TR linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-db/sqlite:= >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson >=dev-qt/qtcore-4.5:4[ssl] >=dev-qt/qtgui-4.5:4 >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4 >=media-libs/chromaprint-0.6 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/libechonest:=[qt4] >=media-libs/libmygpo-qt-1.0.8 >=media-libs/taglib-1.8[mp4] sys-libs/zlib dev-libs/crypto++ virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio ) dbus? ( >=dev-qt/qtdbus-4.5:4 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) dbus? ( udisks? ( sys-fs/udisks:0 ) ) mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0
+REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
+SLOT=0
+SRC_URI=https://github.com/clementine-player/Clementine/archive/1.3.1.tar.gz -> clementine-1.3.1.tar.gz
+_eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=c9da7777dfa132da5c9926c582646ddb
diff --git a/metadata/md5-cache/media-sound/clementine-9999 b/metadata/md5-cache/media-sound/clementine-9999
index c957ce0ab03c..381a292f2f68 100644
--- a/metadata/md5-cache/media-sound/clementine-9999
+++ b/metadata/md5-cache/media-sound/clementine-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-db/sqlite:= >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4 >=media-libs/chromaprint-0.6 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.8 >=media-libs/taglib-1.8[mp4] sys-libs/zlib dev-libs/crypto++ virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio ) dbus? ( >=dev-qt/qtdbus-4.5:4 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) >=dev-libs/boost-1.39:= virtual/pkgconfig sys-devel/gettext dev-qt/qttest:4 dev-cpp/gmock box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) seafile? ( dev-cpp/sparsehash ) pulseaudio? ( media-sound/pulseaudio ) skydrive? ( dev-cpp/sparsehash ) test? ( gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
+DEPEND=dev-db/sqlite:= >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson >=dev-qt/qtcore-4.5:4[ssl] >=dev-qt/qtgui-4.5:4 >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4 >=media-libs/chromaprint-0.6 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.8 >=media-libs/taglib-1.8[mp4] sys-libs/zlib dev-libs/crypto++ virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio ) dbus? ( >=dev-qt/qtdbus-4.5:4 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) >=dev-libs/boost-1.39:= virtual/pkgconfig sys-devel/gettext dev-qt/qttest:4 dev-cpp/gmock box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) seafile? ( dev-cpp/sparsehash ) pulseaudio? ( media-sound/pulseaudio ) skydrive? ( dev-cpp/sparsehash ) test? ( gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A modern music player and library organizer based on Amarok 1.4 and Qt4
 EAPI=6
 HOMEPAGE=http://www.clementine-player.org https://github.com/clementine-player/Clementine
 IUSE=box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks udisks_legacy vkontakte wiimote linguas_af linguas_ar linguas_be linguas_bg linguas_bn linguas_br linguas_bs linguas_ca linguas_cs linguas_cy linguas_da linguas_de linguas_el linguas_en_CA linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_ga linguas_gl linguas_he linguas_he_IL linguas_hi linguas_hr linguas_hu linguas_hy linguas_ia linguas_id linguas_is linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_lv linguas_mr linguas_ms linguas_my linguas_nb linguas_nl linguas_oc linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_si_LK linguas_sk linguas_sl linguas_sr linguas_sr@latin linguas_sv linguas_te linguas_tr linguas_tr_TR linguas_uk linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW test
 LICENSE=GPL-3
-RDEPEND=dev-db/sqlite:= >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson >=dev-qt/qtcore-4.5:4 >=dev-qt/qtgui-4.5:4 >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4 >=media-libs/chromaprint-0.6 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.8 >=media-libs/taglib-1.8[mp4] sys-libs/zlib dev-libs/crypto++ virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio ) dbus? ( >=dev-qt/qtdbus-4.5:4 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) dbus? ( udisks? ( sys-fs/udisks:2 ) udisks_legacy? ( sys-fs/udisks:0 ) ) mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0
+RDEPEND=dev-db/sqlite:= >=dev-libs/glib-2.24.1-r1 dev-libs/libxml2 dev-libs/protobuf:= dev-libs/qjson >=dev-qt/qtcore-4.5:4[ssl] >=dev-qt/qtgui-4.5:4 >=dev-qt/qtopengl-4.5:4 >=dev-qt/qtsql-4.5:4 >=media-libs/chromaprint-0.6 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.8 >=media-libs/taglib-1.8[mp4] sys-libs/zlib dev-libs/crypto++ virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio ) dbus? ( >=dev-qt/qtdbus-4.5:4 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) mtp? ( >=media-libs/libmtp-1.0.0 ) moodbar? ( sci-libs/fftw:3.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) dbus? ( udisks? ( sys-fs/udisks:2 ) udisks_legacy? ( sys-fs/udisks:0 ) ) mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0
 REQUIRED_USE=udisks? ( dbus ) udisks_legacy? ( dbus ) wiimote? ( dbus )
 SLOT=0
 _eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=9aa4c6bfa19e8c47bcd86ffb715fdbfd
+_md5_=5c9e5c8e6d9a624210722921c3d2841f
diff --git a/metadata/md5-cache/net-mail/mailbox-count-0.0.2-r1 b/metadata/md5-cache/net-mail/mailbox-count-0.0.2-r1
new file mode 100644
index 000000000000..ea2de50bade0
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mailbox-count-0.0.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-haskell/cabal-1.16.0 >=dev-haskell/cmdargs-0.10 >=dev-haskell/configurator-0.2 >=dev-haskell/hdbc-2.4 >=dev-haskell/hdbc-postgresql-2.3 >=dev-haskell/hdbc-sqlite-2.3 >=dev-haskell/missingh-1.2 >=dev-haskell/tasty-0.8 >=dev-haskell/tasty-hunit-0.8 >=dev-lang/ghc-7.6.1 test? ( >=dev-haskell/doctest-0.9 >=dev-haskell/filemanip-0.3.6 ) >=dev-haskell/cabal-1.1.4
+DESCRIPTION=Count mailboxes in a SQL database
+EAPI=6
+HOMEPAGE=http://hackage.haskell.org/package/mailbox-count
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/mailbox-count/0.0.2/mailbox-count-0.0.2.tar.gz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	ghc-package	0269d47e1819247f102e9f72ae185b52	haskell-cabal	b1a55b9f1cf94a3a9dcce663465ae7a6	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=92400b38fb6e037b5409ab3deb8489f6
diff --git a/metadata/md5-cache/net-misc/gns3-gui-1.4.4-r2 b/metadata/md5-cache/net-misc/gns3-gui-1.5.1
similarity index 76%
rename from metadata/md5-cache/net-misc/gns3-gui-1.4.4-r2
rename to metadata/md5-cache/net-misc/gns3-gui-1.5.1
index d89ca6f66ff4..42b63a34c207 100644
--- a/metadata/md5-cache/net-misc/gns3-gui-1.4.4-r2
+++ b/metadata/md5-cache/net-misc/gns3-gui-1.5.1
@@ -6,9 +6,9 @@ HOMEPAGE=http://www.gns3.net/
 IUSE=python_targets_python3_4
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=>=dev-python/libcloud-0.15.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/ws4py-0.3.4[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/requests-2.6.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/paramiko-1.15.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/psutil-3.0.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=net-misc/gns3-converter-1.3.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] =net-misc/gns3-server-1.4.4-r2[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-python/PyQt5[gui,network,svg,widgets,python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
+RDEPEND=>=dev-python/libcloud-0.15.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/ws4py-0.3.4[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/requests-2.6.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/paramiko-1.15.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/psutil-3.0.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=net-misc/gns3-converter-1.3.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] =net-misc/gns3-server-1.5.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-python/PyQt5[gui,network,svg,widgets,python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 )
 SLOT=0
-SRC_URI=https://github.com/GNS3/gns3-gui/archive/v1.4.4.tar.gz -> gns3-gui-1.4.4.tar.gz
+SRC_URI=https://github.com/GNS3/gns3-gui/archive/v1.5.1.tar.gz -> gns3-gui-1.5.1.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=b90099a3132c32df8fef848c76124cde
diff --git a/metadata/md5-cache/net-misc/gns3-server-1.4.4-r2 b/metadata/md5-cache/net-misc/gns3-server-1.4.4-r2
deleted file mode 100644
index 95e92f8bb392..000000000000
--- a/metadata/md5-cache/net-misc/gns3-server-1.4.4-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-DESCRIPTION=GNS3 server to asynchronously manage emulators
-EAPI=6
-HOMEPAGE=http://www.gns3.net/
-IUSE=python_targets_python3_4
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=>=app-emulation/dynamips-0.2.12 >=dev-python/aiohttp-0.14.4[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/docker-py-1.4.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/netifaces-0.8-r2[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/jinja-2.7.3[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.4.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/libcloud-0.14.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/raven-5.2.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/psutil-3.0.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/pyzmq-14.3.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=www-servers/tornado-3.1.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 )
-SLOT=0
-SRC_URI=https://github.com/GNS3/gns3-server/archive/v1.4.4.tar.gz -> gns3-server-1.4.4.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f8cc8f9a6a78936e083a9bf0d85702b6
diff --git a/metadata/md5-cache/net-misc/gns3-server-1.5.1 b/metadata/md5-cache/net-misc/gns3-server-1.5.1
new file mode 100644
index 000000000000..8f2e64f198ba
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gns3-server-1.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
+DESCRIPTION=GNS3 server to asynchronously manage emulators
+EAPI=6
+HOMEPAGE=http://www.gns3.net/
+IUSE=python_targets_python3_4
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=>=app-emulation/dynamips-0.2.12 =dev-python/aiohttp-0.21.5[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/docker-py-1.4.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/netifaces-0.8-r2[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/jinja-2.7.3[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.4.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/libcloud-0.14.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/raven-5.2.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/psutil-3.0.0[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/pyzmq-14.3.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/python-zipstream-1.1.4[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=www-servers/tornado-3.1.1[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/GNS3/gns3-server/archive/v1.5.1.tar.gz -> gns3-server-1.5.1.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=bf1a8877cc03386569309a7be978e1bc
diff --git a/metadata/md5-cache/net-misc/stunnel-5.34-r1 b/metadata/md5-cache/net-misc/stunnel-5.34-r1
index a604fb92b7fe..bddd7b4cc55e 100644
--- a/metadata/md5-cache/net-misc/stunnel-5.34-r1
+++ b/metadata/md5-cache/net-misc/stunnel-5.34-r1
@@ -4,11 +4,11 @@ DESCRIPTION=TLS/SSL - Port Wrapper
 EAPI=5
 HOMEPAGE=http://www.stunnel.org/index.html
 IUSE=ipv6 libressl selinux stunnel3 tcpd ssl
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) stunnel3? ( dev-lang/perl ) selinux? ( sec-policy/selinux-stunnel )
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.stunnel.org/stunnel/archive/5.x/stunnel-5.34.tar.gz http://www.usenix.org.uk/mirrors/stunnel/archive/5.x/stunnel-5.34.tar.gz http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x/stunnel-5.34.tar.gz http://www.namesdir.com/mirrors/stunnel/archive/5.x/stunnel-5.34.tar.gz http://stunnel.cybermirror.org/archive/5.x/stunnel-5.34.tar.gz http://mirrors.zerg.biz/stunnel/archive/5.x/stunnel-5.34.tar.gz ftp://mirrors.go-parts.com/stunnel/archive/5.x/stunnel-5.34.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ssl-cert	b031e94f4c7c34e1d677376b8929821a	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=cddc1b6ecac38e4ebbfd76b5dfbf2ea2
+_md5_=ad8cb3bc336857d142fd8fdcef3bf6e9
diff --git a/metadata/md5-cache/sci-geosciences/qmapshack-1.6.3 b/metadata/md5-cache/sci-geosciences/qmapshack-1.6.3
new file mode 100644
index 000000000000..b8b2567e6cf6
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/qmapshack-1.6.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtwebkit:5 dev-qt/qtscript:5 dev-qt/qtprintsupport:5 dev-qt/qtdbus:5 dev-qt/qttest:5 dev-qt/qtnetwork[ssl] >=sci-geosciences/routino-3.1.1 sci-libs/gdal sci-libs/proj dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=GPS mapping utility
+EAPI=6
+HOMEPAGE=https://bitbucket.org/maproom/qmapshack/wiki/Home
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtwebkit:5 dev-qt/qtscript:5 dev-qt/qtprintsupport:5 dev-qt/qtdbus:5 dev-qt/qttest:5 dev-qt/qtnetwork[ssl] >=sci-geosciences/routino-3.1.1 sci-libs/gdal sci-libs/proj
+SLOT=0
+SRC_URI=https://bitbucket.org/maproom/qmapshack/downloads/qmapshack-1.6.3.tar.gz
+_eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=f025f747f2e5caec9c2b203730f1ccf0
diff --git a/metadata/md5-cache/sci-geosciences/routino-3.1.1 b/metadata/md5-cache/sci-geosciences/routino-3.1.1
new file mode 100644
index 000000000000..931309e6bbc4
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/routino-3.1.1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile configure
+DESCRIPTION=Routing application based on openstreetmap data
+EAPI=6
+HOMEPAGE=http://www.routino.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3+
+SLOT=0
+SRC_URI=http://www.routino.org/download/routino-3.1.1.tgz
+_md5_=6023f9a861c3786bcdddda5d824dd9f5
diff --git a/metadata/md5-cache/sys-devel/llvm-3.8.1 b/metadata/md5-cache/sys-devel/llvm-3.8.1
index 3f688a332ff5..d4f4f7e4f106 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.8.1
+++ b/metadata/md5-cache/sys-devel/llvm-3.8.1
@@ -9,7 +9,7 @@ LICENSE=UoI-NCSA
 PDEPEND=clang? ( =sys-devel/clang-3.8.1-r100 )
 RDEPEND=sys-libs/zlib:0= clang? ( python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) static-analyzer? ( dev-lang/perl:* >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lldb? ( dev-python/six[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ocaml? ( >=dev-lang/ocaml-4.00.0:0= dev-ml/findlib dev-ml/ocaml-ctypes !!<=sys-devel/llvm-3.7.0-r1[ocaml] ) clang? ( !<=sys-devel/clang-3.8.1-r99 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=python_targets_python2_7 lldb? ( clang xml )
-SLOT=0/3.8.1
+SLOT=0/3.8.0
 SRC_URI=http://llvm.org/releases/3.8.1/llvm-3.8.1.src.tar.xz clang? ( http://llvm.org/releases/3.8.1/compiler-rt-3.8.1.src.tar.xz http://llvm.org/releases/3.8.1/cfe-3.8.1.src.tar.xz http://llvm.org/releases/3.8.1/clang-tools-extra-3.8.1.src.tar.xz ) lldb? ( http://llvm.org/releases/3.8.1/lldb-3.8.1.src.tar.xz ) !doc? ( http://dev.gentoo.org/~voyageur/distfiles/llvm-3.8.0-manpages.tar.bz2 )
 _eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	prefix	e7f2b9c6e57342e5d25eac22fce23062	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=029d9aeec8e450325c100f8aa2eaec39
+_md5_=64e8b23ecb68979858720a01c17328e8
diff --git a/metadata/md5-cache/www-client/chromium-51.0.2704.63 b/metadata/md5-cache/www-client/chromium-51.0.2704.63
deleted file mode 100644
index 4c61daf6585a..000000000000
--- a/metadata/md5-cache/www-client/chromium-51.0.2704.63
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= >=dev-libs/jsoncpp-0.5.0-r1:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= media-libs/libexif:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= gtk3? ( x11-libs/gtk+:3= ) !gtk3? ( x11-libs/gtk+:2= ) x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) !gn? ( >=app-accessibility/speech-dispatcher-0.8:= app-arch/snappy:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= media-libs/flac:= >=media-libs/harfbuzz-0.9.41:=[icu(+)] >=media-libs/libjpeg-turbo-1.2.0-r1:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] ) !arm? ( dev-lang/yasm ) dev-lang/perl dev-perl/JSON >=dev-util/gperf-3.0.3 dev-util/ninja sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/beautifulsoup:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/jinja[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/ply[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=5
-HOMEPAGE=http://chromium.org/
-IUSE=cups gn gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_419 +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=BSD hotwording? ( no-source-code )
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= >=dev-libs/jsoncpp-0.5.0-r1:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= media-libs/libexif:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= gtk3? ( x11-libs/gtk+:3= ) !gtk3? ( x11-libs/gtk+:2= ) x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) !gn? ( >=app-accessibility/speech-dispatcher-0.8:= app-arch/snappy:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= media-libs/flac:= >=media-libs/harfbuzz-0.9.41:=[icu(+)] >=media-libs/libjpeg-turbo-1.2.0-r1:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-37 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-REQUIRED_USE=gn? ( kerberos !system-ffmpeg !tcmalloc )
-RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-51.0.2704.63.tar.xz
-_eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	chromium	68a1fdd848f60137c312a25c9888fbd1	eutils	792f83d5ec9536cb5ccef375469d8bde	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	portability	bb1a0ed8ea152b957d17339f01d4d7f5	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=9291364beb2efe748d2bdb440dc2dc37
diff --git a/metadata/md5-cache/www-servers/apache-2.4.23 b/metadata/md5-cache/www-servers/apache-2.4.23
index f38d76122bd5..75a54fef5b9e 100644
--- a/metadata/md5-cache/www-servers/apache-2.4.23
+++ b/metadata/md5-cache/www-servers/apache-2.4.23
@@ -4,7 +4,7 @@ DESCRIPTION=The Apache Web Server
 EAPI=5
 HOMEPAGE=https://httpd.apache.org/
 IUSE=ssl debug doc ldap libressl selinux ssl static suexec threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_cache apache2_modules_cache_disk apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_macro apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_fcgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_speling apache2_modules_socache_shmcb apache2_modules_status apache2_modules_substitute apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris
 LICENSE=Apache-2.0 Apache-1.1
 PDEPEND=~app-admin/apache-tools-2.4.23
 RDEPEND=>=dev-libs/apr-1.5.1 !www-apache/mod_macro dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_mime? ( app-misc/mime-types ) ldap? ( =net-nds/openldap-2* ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:= ) ) !=www-servers/apache-1* selinux? ( sec-policy/selinux-apache )
@@ -12,4 +12,4 @@ REQUIRED_USE=apache2_modules_http2? ( ssl )
 SLOT=2
 SRC_URI=mirror://apache/httpd/httpd-2.4.23.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.18-r1-20160303.tar.bz2
 _eclasses_=apache-2	d6aa6adb26a2cae934a099a0c82c6128	autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ssl-cert	b031e94f4c7c34e1d677376b8929821a	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ca5db8fd70a3b0821d67decb5e47bdef
+_md5_=498b15fd6c83f839234c5220c74c69fb
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-367.27 b/metadata/md5-cache/x11-drivers/nvidia-drivers-367.27
index f2e3b92042cb..7fa8a8c94eb5 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-367.27
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-367.27
@@ -10,6 +10,6 @@ RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tool
 REQUIRED_USE=tools? ( X ) static-libs? ( tools )
 RESTRICT=bindist mirror
 SLOT=0/367
-SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/367.27/NVIDIA-FreeBSD-x86_64-367.27.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/367.27/NVIDIA-Linux-x86_64-367.27.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/367.27/NVIDIA-FreeBSD-x86-367.27.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/367.27/NVIDIA-Linux-x86-367.27.run ) tools? ( ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-367.27.tar.bz2 )
+SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/367.27/NVIDIA-FreeBSD-x86_64-367.27.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/367.27/NVIDIA-Linux-x86_64-367.27.run ) arm? ( http://us.download.nvidia.com/XFree86/Linux-x86-ARM/367.27/NVIDIA-Linux-armv7l-gnueabihf-367.27.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/367.27/NVIDIA-FreeBSD-x86-367.27.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/367.27/NVIDIA-Linux-x86-367.27.run ) tools? ( ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-367.27.tar.bz2 )
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	d062ae4ba2fc40a19c11de2ad89b6616	nvidia-driver	fe3e559a49de32cd7df5ae282f98d107	portability	bb1a0ed8ea152b957d17339f01d4d7f5	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	udev	73058269b3e70e34e084fa3981282338	unpacker	45d07319df5f40ee6af58418b0f930be	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2d955a1c17a960a8c0fc75883307e5d3
+_md5_=e9fa4285a06ed3fa7d02b474dd533ecb
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-367.35 b/metadata/md5-cache/x11-drivers/nvidia-drivers-367.35
new file mode 100644
index 000000000000..61bc109c6e7d
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-367.35
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend setup unpack
+DEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) sys-apps/pciutils virtual/pkgconfig
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=5
+HOMEPAGE=http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx
+IUSE=acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X kernel_linux
+KEYWORDS=-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2 NVIDIA-r2
+RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( >=app-eselect/eselect-opengl-1.0.9 app-misc/pax-utils ) acpi? ( sys-power/acpid ) tools? ( !media-video/nvidia-settings ) wayland? ( dev-libs/wayland ) X? ( <x11-base/xorg-server-1.18.99:= >=x11-libs/libvdpau-1.0 multilib? ( >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] ) ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=tools? ( X ) static-libs? ( tools )
+RESTRICT=bindist mirror
+SLOT=0/367
+SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/367.35/NVIDIA-FreeBSD-x86_64-367.35.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/367.35/NVIDIA-Linux-x86_64-367.35.run ) arm? ( http://us.download.nvidia.com/XFree86/Linux-x86-ARM/367.35/NVIDIA-Linux-armv7l-gnueabihf-367.35.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/367.35/NVIDIA-FreeBSD-x86-367.35.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/367.35/NVIDIA-Linux-x86-367.35.run ) tools? ( ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-367.35.tar.bz2 )
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	linux-mod	4755518412586c2fd655ff6e55780bcb	multilib	d062ae4ba2fc40a19c11de2ad89b6616	nvidia-driver	fe3e559a49de32cd7df5ae282f98d107	portability	bb1a0ed8ea152b957d17339f01d4d7f5	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	udev	73058269b3e70e34e084fa3981282338	unpacker	45d07319df5f40ee6af58418b0f930be	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=e9fa4285a06ed3fa7d02b474dd533ecb
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 58b0bf235282..adee049f4cc9 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 15 Jul 2016 22:10:41 +0000
+Sat, 16 Jul 2016 14:40:47 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index a2daa947da59..49b8c1a7f2a3 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Jul 15 22:09:47 UTC 2016
+Sat Jul 16 14:39:52 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 175610f41931..8dfd3d9feaca 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 15 Jul 2016 22:30:01 +0000
+Sat, 16 Jul 2016 15:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 6f7754c205a6..fdb578f98a78 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1468620601 Fri 15 Jul 2016 10:10:01 PM UTC
+1468680001 Sat 16 Jul 2016 02:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 58b0bf235282..d921a4bdad67 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 15 Jul 2016 22:10:41 +0000
+Sat, 16 Jul 2016 14:40:46 +0000
diff --git a/net-mail/mailbox-count/Manifest b/net-mail/mailbox-count/Manifest
new file mode 100644
index 000000000000..831867e01389
--- /dev/null
+++ b/net-mail/mailbox-count/Manifest
@@ -0,0 +1 @@
+DIST mailbox-count-0.0.2.tar.gz 20644 SHA256 6eef4b2300a8a5a53bb44ec8c192324025ebddcdc81c2ba145f812a941dba3fd SHA512 98e39927382719295260c64bd5888244000dbbb3fbd7f6405dcffe78a4fc5f1dea7f8236542e58eb0118bb421c19225a8be0560b92c7688c0701418c7221d569 WHIRLPOOL e8a01030415a3be24926d9b0f6ba812a706d361f065c3b8a7622ab532f31282f4d506e976f1fefdf208039ddc95e1e9b8002e27e01d67ca3648cb85cf7cff7e8
diff --git a/net-mail/mailbox-count/mailbox-count-0.0.2-r1.ebuild b/net-mail/mailbox-count/mailbox-count-0.0.2-r1.ebuild
new file mode 100644
index 000000000000..2fc2721c9dfa
--- /dev/null
+++ b/net-mail/mailbox-count/mailbox-count-0.0.2-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# ebuild generated by hackport 0.4.2
+
+CABAL_FEATURES="bin test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Count mailboxes in a SQL database"
+HOMEPAGE="http://hackage.haskell.org/package/mailbox-count"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.16.0
+	>=dev-haskell/cmdargs-0.10
+	>=dev-haskell/configurator-0.2
+	>=dev-haskell/hdbc-2.4
+	>=dev-haskell/hdbc-postgresql-2.3
+	>=dev-haskell/hdbc-sqlite-2.3
+	>=dev-haskell/missingh-1.2
+	>=dev-haskell/tasty-0.8
+	>=dev-haskell/tasty-hunit-0.8
+	>=dev-lang/ghc-7.6.1
+	test? ( >=dev-haskell/doctest-0.9
+		>=dev-haskell/filemanip-0.3.6 )
+"
diff --git a/net-mail/mailbox-count/metadata.xml b/net-mail/mailbox-count/metadata.xml
new file mode 100644
index 000000000000..fb7f98befbe3
--- /dev/null
+++ b/net-mail/mailbox-count/metadata.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  	<maintainer type="person">
+		<email>mjo@gentoo.org</email>
+		<name>Michael Orlitzky</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		/Usage/:
+		
+		@
+		mailbox-count [OPTIONS]
+		@
+		
+		Mailbox-count produces a simple count of mailboxes that exist
+		per-domain in some SQL database. The default queries are compatible
+		with the schema used by PostfixAdmin &lt;http://postfixadmin.sourceforge.net/&gt;,
+		but it is possible to supply your own queries via the @--summary-query@
+		and @--detail-query@ options.
+		
+		The summary report lists each domain, along with the number of
+		mailboxes owned by that domain. The order is determined by the summary
+		query, which lists the domains alphabetically by default.
+		
+		The default detail report shows the same, but also contains a list of
+		each individual mailbox (again in alphabetical order) belonging to the
+		domains.
+		
+		/Input/:
+		
+		None.
+		
+		/Output/:
+		
+		Either a summary, or detailed report (with @--detail@) of the
+		number of mailboxes per-domain contained in the database.
+		
+		/Options/:
+		
+		@
+		\--database
+		@
+		
+		The name of the database (or file, if SQLite) to which we should
+		connect.
+		
+		Default: The name of the current user (Postgres only).
+		
+		@
+		\--detail
+		@
+		
+		Produce a detailed report listing all mailboxes by domain.
+		
+		@
+		\--detail-query
+		@
+		
+		SQL query used to produce the detail report. This should return the
+		set of all (domain, username) pairs. See the default value for an
+		example.
+		
+		Default: \"SELECT domain,username FROM mailbox ORDER BY domain;\"
+		
+		@
+		\--host
+		@
+		
+		Hostname where the database is located (Postgres-only).
+		
+		Default: None, a UNIX domain socket connection is attempted (Postgres only)
+		
+		@
+		\--password
+		@
+		
+		Password used to connect to the database (Postgres-only).
+		
+		Default: None (assumes passwordless authentication)
+		
+		@
+		\--port
+		@
+		Port number used to connect to the database (Postgres-only).
+		
+		Default: None, a UNIX domain socket connection is attempted (Postgres only)
+		
+		@
+		\--summary-query
+		@
+		
+		SQL query used to produce the summary report. This should return
+		(domain, user count) pairs. See the default value for an
+		example.
+		
+		Default: \"SELECT domain,COUNT(username) FROM mailbox GROUP BY domain
+		ORDER BY domain;\"
+		
+		@
+		\--username
+		@
+		
+		Username used to connect to the database (Postgres-only).
+		
+		Default: The current user
+		
+		/Examples/:
+		
+		The default summary report:
+		
+		@
+		$ mailbox-count --database=postfixadmin.sqlite3
+		Summary (number of mailboxes per domain)
+		\----------------------------------------
+		example.com:     3
+		example.invalid: 1
+		example.net:     2
+		example.org:     1
+		@
+		
+		The more detailed report:
+		
+		@
+		$ mailbox-count --detail --database=postfixadmin.sqlite3
+		Detail (list of all mailboxes by domain)
+		\----------------------------------------
+		example.com (3):
+		&amp;#x20; user1
+		&amp;#x20; user3
+		&amp;#x20; user5
+		example.invalid (1):
+		&amp;#x20; user7
+		example.net (2):
+		&amp;#x20; user2
+		&amp;#x20; user4
+		example.org (1):
+		&amp;#x20; user6
+		@
+	</longdescription>
+</pkgmetadata>
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index d31a3659fac2..58f0587acd84 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,2 +1,2 @@
-DIST gns3-gui-1.4.4.tar.gz 5725385 SHA256 28ae4bb797e1a20bbb16eca3e58b37c80e93046f44393366780544cf090cf657 SHA512 e77977ea03f686fc5dd15416ed7f8e1262c8a3e1d5b6af598cf6ff938e75c8b65de1930aa75ad3d14f3d2f5c348ddba6c22ed1c5d91842538940c60aba0e985d WHIRLPOOL 46a4480a94ffcfe31e68302f68e01d87c46da43bac2bd635bd2a8c7aa9c03af66416f6eec44b387f084268b5ccec1fbd38100593d89469c51fb111a72cfd7b16
 DIST gns3-gui-1.4.6.tar.gz 5728597 SHA256 51fd20836199a851502b3890ee8b1f795c1081ce988e375d81f9286ef5f26bd5 SHA512 0d9537dc192197f0f5df65bb16129418ada6ce614c3f9958ab2447b03c45070bfb7bda166c3b2db89fbcd98c477fb2b920c33acb60ca94ed74bb066c2a032e08 WHIRLPOOL 00368df583be863604cd54cd548f64a49b0176b3ac0ab413ed2f8011c842c9daa3ff35606bc4b6daa6d2a84f7c5f010581140a87b35c48e9ccf138feee0343db
+DIST gns3-gui-1.5.1.tar.gz 5782262 SHA256 9e13a3c9c4ca6bf71da5113e8b4f5acdf354ecee4cd34ecdae34a4980c2f3b80 SHA512 5bde8d6b7a3e8fd117a32142e42f312258b4dd808cf9d76e9da292ee23896056915e6c1e6cc9b2e2b78bd564ab145b12d3616d24108f4ea37505981f1fcca21f WHIRLPOOL 9fb7152fe2f22ca1e28aa0d248812d9ff5713e568dcd3f5b150f8e40a03a88d0b66741bceb17e4b5e00951863409412128c32b832dbe1fc4ba2a9870694bf808
diff --git a/net-misc/gns3-gui/gns3-gui-1.4.4-r2.ebuild b/net-misc/gns3-gui/gns3-gui-1.5.1.ebuild
similarity index 100%
rename from net-misc/gns3-gui/gns3-gui-1.4.4-r2.ebuild
rename to net-misc/gns3-gui/gns3-gui-1.5.1.ebuild
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index b79536c7184e..c116785ec4d7 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,2 +1,2 @@
-DIST gns3-server-1.4.4.tar.gz 240044 SHA256 8414dc70a034673265b8c3b80265782d2f91bce9e8c710c9aff01c4b653f6f14 SHA512 9c9f4ab54ffe4e1b8c139cffcf8241dbb33f3e20c55c0c6bfd6edb9135e5ce9ece467c3f934d465e705d815d0b158062cd5f5c4861bc5bd944502caf8b2204ed WHIRLPOOL a1e0a32a04d7b616adedbb1518b234bc0f1154994fef93518f58148efaf44b25d2688dd95530119cb3e5f551e1fc60b2ce2976d0f244881c67d4df25fbfa0bd3
 DIST gns3-server-1.4.6.tar.gz 244880 SHA256 786a9fb0b5882f66dd9292428c54de5c4da81419e114ae6c0f77030d89eca463 SHA512 7e659bc283b8e078c4165b3df09b6db03707f413239d359710520e53c4e6ce0c9c820beb29ad8c0889b41fa878ec55e640318c2d70f0d0b6300abcf4062010cb WHIRLPOOL 4d759060519fbcb86c8daf50870642ce49dd14408b1b3d9894ca14839e51745d860bcfe42274832cc628998683c943989b37ffe4ca1326d1bcd1a9b092e73bbe
+DIST gns3-server-1.5.1.tar.gz 845469 SHA256 e871ebe00f2a66876a99c9e71c65afaf74e5d5165c49984033f8599ecf49939e SHA512 fcf5ca0a3bbf5224554c9cecd90a7aded9b658e64eccb778d47ac08c9b4dd567bd757977e8dd54c165d49b24033b99d2b95d5c4892e2b8ad2924d7d3a4c2d9d3 WHIRLPOOL b412c048cc8f6d110dfbca90b50f32db078bc4519bc4e6b99f41d5fccdd487eb997b3ae9f4c3ddb6bb3bae9e4c191d984907194a954f9d5266ad798b24d933f5
diff --git a/net-misc/gns3-server/gns3-server-1.4.4-r2.ebuild b/net-misc/gns3-server/gns3-server-1.5.1.ebuild
similarity index 92%
rename from net-misc/gns3-server/gns3-server-1.4.4-r2.ebuild
rename to net-misc/gns3-server/gns3-server-1.5.1.ebuild
index 4f0b76b25e49..ebebb91d18bc 100644
--- a/net-misc/gns3-server/gns3-server-1.4.4-r2.ebuild
+++ b/net-misc/gns3-server/gns3-server-1.5.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND=">=app-emulation/dynamips-0.2.12
-		>=dev-python/aiohttp-0.14.4[${PYTHON_USEDEP}]
+		=dev-python/aiohttp-0.21.5[${PYTHON_USEDEP}]
 		>=dev-python/docker-py-1.4.0[${PYTHON_USEDEP}]
 		>=dev-python/netifaces-0.8-r2[${PYTHON_USEDEP}]
 		>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
@@ -26,6 +26,7 @@ RDEPEND=">=app-emulation/dynamips-0.2.12
 		>=dev-python/raven-5.2.0[${PYTHON_USEDEP}]
 		>=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
+		>=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
 		>=www-servers/tornado-3.1.1[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/net-misc/stunnel/stunnel-5.34-r1.ebuild b/net-misc/stunnel/stunnel-5.34-r1.ebuild
index ce4aacfcf46a..07a2b389456d 100644
--- a/net-misc/stunnel/stunnel-5.34-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.34-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest
index 1cc3b44d9954..9d4abcdbc61a 100644
--- a/sci-geosciences/qmapshack/Manifest
+++ b/sci-geosciences/qmapshack/Manifest
@@ -1 +1,2 @@
 DIST qmapshack-1.6.1.tar.gz 4538423 SHA256 e702482ef894ec3fdbc5a932dd220bbb34eef1580b1645a314e9a3fa99956c22 SHA512 f6437004a79a875bdbfe6567bc1a771c6862ca7f851306ccf3ab044a28c4071eff227b3e5a200a21ec30c65df29e8e7371d32c0b4c8b5cc2799cf224adb892a6 WHIRLPOOL 0b180e5265a2a739008f0128947eaf28102dcb5d21041206631654b098d770d0c2e3ff3086289f1370df358747be033d326b93be4d44174e8738adcfa6faa9b4
+DIST qmapshack-1.6.3.tar.gz 5181205 SHA256 6fa5158bd823e8d43eb8a4e4db35a05720d1fe8d624eb65320b905ae315bd708 SHA512 6e9efdd35ebf3980011aea0cefdbcc433e4f0d333cbeff72e70880a41bff972cc27f4517e243f4990b5e04112a50af2651d99cb5c1c6e542341db30e5e000133 WHIRLPOOL 7fa7e8bbd658f351e5d62ef979a91e291207d1b25a5a94c335051dd93e1f41947dc612eec80c2134e7929edca0becaa0c866e9060e0cbe7c54a856d480acd938
diff --git a/sci-geosciences/qmapshack/qmapshack-1.6.3.ebuild b/sci-geosciences/qmapshack/qmapshack-1.6.3.ebuild
new file mode 100644
index 000000000000..804ab6c6074e
--- /dev/null
+++ b/sci-geosciences/qmapshack/qmapshack-1.6.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="GPS mapping utility"
+HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home"
+SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtwebkit:5
+	dev-qt/qtscript:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtdbus:5
+	dev-qt/qttest:5
+	dev-qt/qtnetwork[ssl]
+	>=sci-geosciences/routino-3.1.1
+	sci-libs/gdal
+	sci-libs/proj"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
diff --git a/sci-geosciences/routino/Manifest b/sci-geosciences/routino/Manifest
index 222a9cc2d6e8..4e42f1da0894 100644
--- a/sci-geosciences/routino/Manifest
+++ b/sci-geosciences/routino/Manifest
@@ -1 +1,2 @@
 DIST routino-3.0_p1.tgz 957022 SHA256 037892a09cf2bb790d895d218a80c221e9595a3943ca35163c71ed93b111431e SHA512 be6275e8fcc0fe535a0940ba26fdf8e8ecfde768e4b2baaabf088a39431dc259933c3aa02ff3e28c5bf145402d18e6369a16d2c7a50fd1b84695dd31c155341f WHIRLPOOL 1e097aaa00437e08b485f4ce9d027cb31f3e320b5f61883a230ad235ccea8ca53c79bf0e428013434b91d0533f1212c43dd8a9f05eec2394cced070f83eb61ef
+DIST routino-3.1.1.tgz 1795118 SHA256 23b9fce43f0a85c9efe220c6c72026dd7b37f6a4a5153bb9dc4c4b0747c7f282 SHA512 088f22e9297f485418ed369d00827690f86e224e331b69085513339870fe6d97cffef62aa5e7e14883800469beff4af4b0a581ba8bad78920a383d7152be6ede WHIRLPOOL 914180a728120ba189ff9bc2bf51c64246f635f7cc2e6b6efecf4dbb2c76f9b61f6269225620b5a5204025c838a6fcd8ffc24953a8cf24c084edbbdfb24a6b58
diff --git a/sci-geosciences/routino/files/routino-3.1.1.patch b/sci-geosciences/routino/files/routino-3.1.1.patch
new file mode 100644
index 000000000000..15ba41b73feb
--- /dev/null
+++ b/sci-geosciences/routino/files/routino-3.1.1.patch
@@ -0,0 +1,34 @@
+diff -r -U1 routino-3.1.1.orig/Makefile.conf routino-3.1.1/Makefile.conf
+--- routino-3.1.1.orig/Makefile.conf	2016-03-05 19:49:21.000000000 +0600
++++ routino-3.1.1/Makefile.conf	2016-07-16 20:09:22.208869580 +0600
+@@ -47,3 +47,3 @@
+ ifneq ($(HOST),MINGW)
+-prefix=/usr/local
++prefix=/usr
+ bindir=$(prefix)/bin
+@@ -51,3 +51,3 @@
+ libdir=$(prefix)/lib
+-docdir=$(prefix)/doc/routino
++docdir=$(prefix)/share/doc/$(PF)
+ datadir=$(prefix)/share/routino
+@@ -76,6 +76,6 @@
+ # Maths library
+-LDFLAGS=-lm
++LDFLAGS+=-lm
+ 
+ # Language dialect selection
+-CFLAGS=-std=c99
++CFLAGS+=-std=c99
+ 
+@@ -85,3 +85,3 @@
+ # Optimisation options
+-CFLAGS+=-O3
++#CFLAGS+=-O3
+ CFLAGS+=-ffast-math
+@@ -141,4 +141,4 @@
+ # Required for xz support (uncomment these two lines if required)
+-#CFLAGS+=-DUSE_XZ
+-#LDFLAGS+=-llzma
++CFLAGS+=-DUSE_XZ
++LDFLAGS+=-llzma
+ 
diff --git a/sci-geosciences/routino/routino-3.1.1.ebuild b/sci-geosciences/routino/routino-3.1.1.ebuild
new file mode 100644
index 000000000000..adc5f96bc9fc
--- /dev/null
+++ b/sci-geosciences/routino/routino-3.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=6
+
+DESCRIPTION="Routing application based on openstreetmap data"
+HOMEPAGE="http://www.routino.org/"
+SRC_URI="http://www.routino.org/download/${P}.tgz"
+LICENSE="AGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND=""
+PATCHES=( "${FILESDIR}"/${P}.patch )
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	emake -j1
+	rm README.txt
+	mv doc/rm README.txt .
+}
diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild
index 98b01a89ef9f..cc7982bc6a0c 100644
--- a/sys-devel/llvm/llvm-3.8.1.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz
 	!doc? ( http://dev.gentoo.org/~voyageur/distfiles/${PN}-3.8.0-manpages.tar.bz2 )"
 
 LICENSE="UoI-NCSA"
-SLOT="0/${PV}"
+SLOT="0/3.8.0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="clang debug doc gold libedit +libffi lldb multitarget ncurses ocaml
 	python +static-analyzer test xml video_cards_radeon
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 96bc5b94dc5b..301fa0212986 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,4 @@
 DIST chromium-51.0.2704.103.tar.xz 448638748 SHA256 76735b6dc4100e84c4dbcf5b2336bf8a2eb9cc6402c31e8865878a086971d72b SHA512 04f1e0dfc2d94094064ea47c5e5e8c7b079001d48a4eb5d86873e36ed6f6527c2e16fe8232d3126f3fd7a758a8e306030ef56803b474a88e01446190d55f585a WHIRLPOOL 90b28e1bfec9234de6f7a5a8e1343818ce8cc6b8aaca1c70b03a97a9b797370b745c593089e9c2088ca4829be897048f8bec104483eeafc15a9eabee025fca5a
-DIST chromium-51.0.2704.63.tar.xz 448628724 SHA256 b243e46e0ebaf8f60d1c37a0d99f1fdd80e1597667be4776a1862bb004e4eee9 SHA512 d85b6adcf2be5082ec8dc51f62849b3a2d84104d225188b7c5441cd3f9bb1e639b8d9b8cfb069b4a42d2f44128111649982fd20ca99b4f4ed5208c2c2c1a9560 WHIRLPOOL 0b3047c1c38386dbc20ef8fd6992e3c1cfc4e92986f5cbbd3e640671763ff5023427d0d8b5a6a6f6604aaeea4e2fa57e4b3f88d8e47e20684e5c774e8407c8fb
 DIST chromium-52.0.2743.49.tar.xz 457976744 SHA256 e6ea112da3395b5f701988445b15f1d0c98c3e786544751e47a796812c1ea881 SHA512 22b713efabf50c3812ad8b552ecb082de7f01637f740d91fd90409bcbee26b7a05d391cd0755bdc81483988418ed428b1378686a2525293cf65ca23d7c4e2eaf WHIRLPOOL 2b73d3fa8725de7b3aa58e09218381a61bf0a6dad0e5c306e45da55fcec076cb9195f3b92ce4fd6dc7b40ccf6948a66f1e5e8ad68cc81e9f9e0848c6f5b5ad81
 DIST chromium-52.0.2743.60.tar.xz 458145672 SHA256 f97776c256b61dc0d563dc7b615f2126d0ce408fc21711f2964ce2b50d5f6ecb SHA512 44cfd50d79a753f7ce98d8a8f8ae30fff9bd76a1c1b6b898bddd0cb1ce05695489b09b8dbc6f608e0bf3261631f390ec85f2b9c8701b12787fcc140962dc7c7a WHIRLPOOL 43156148a10b8f3c89b67722f9efecf1fb6d18c80b789d06476217846eb49f2d9591052ce14656f50c08d3b30148846cb95ec335ce58b85c67aae84605c6f6b3
 DIST chromium-53.0.2783.2.tar.xz 460335548 SHA256 dfe2c3554fd9ff3988507725096c1b2604514ca61e3fe4c2c0cdbe8d56c4b426 SHA512 35f4373af36de6404b1caf3db6ac72f2724021c8e01342b915fba9eb1f7dd1ab0ef886b3b519a04699f7f42479ef0f5379a975e3070ca929ae260de1103f72fb WHIRLPOOL 61204d46e13f4651de61bcd77d93e584da34fc6b153bda71051d1520ab34e1d8b612f89b7492be70c9cdc42550ee0479b4a8d2e2a13e95c52c6ec92c61626059
diff --git a/www-client/chromium/chromium-51.0.2704.63.ebuild b/www-client/chromium/chromium-51.0.2704.63.ebuild
deleted file mode 100644
index fa82a4f8ceaa..000000000000
--- a/www-client/chromium/chromium-51.0.2704.63.ebuild
+++ /dev/null
@@ -1,696 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
-	portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
-
-LICENSE="BSD hotwording? ( no-source-code )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="cups gn gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-
-# TODO: bootstrapped gn binary hangs when using tcmalloc with portage's sandbox.
-REQUIRED_USE="gn? ( kerberos !system-ffmpeg !tcmalloc )"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-RDEPEND="
-	app-arch/bzip2:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat:=
-	dev-libs/glib:=
-	>=dev-libs/jsoncpp-0.5.0-r1:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	gnome? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	media-libs/libexif:=
-	media-libs/speex:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:= )
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	>=sys-libs/libcap-2.22:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:=
-	gtk3? ( x11-libs/gtk+:3= )
-	!gtk3? ( x11-libs/gtk+:2= )
-	x11-libs/libdrm
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	kerberos? ( virtual/krb5 )
-	!gn? (
-		>=app-accessibility/speech-dispatcher-0.8:=
-		app-arch/snappy:=
-		>=dev-libs/libevent-1.4.13:=
-		dev-libs/libxml2:=[icu]
-		dev-libs/libxslt:=
-		media-libs/flac:=
-		>=media-libs/harfbuzz-0.9.41:=[icu(+)]
-		>=media-libs/libjpeg-turbo-1.2.0-r1:=
-		>=media-libs/libwebp-0.4.0:=
-		sys-libs/zlib:=[minizip]
-	)"
-DEPEND="${RDEPEND}
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-perl/JSON
-	>=dev-util/gperf-3.0.3
-	dev-util/ninja
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig"
-
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND+="
-	!=www-client/chromium-9999
-	!<www-plugins/chrome-binary-plugins-37
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )"
-
-# Python dependencies. The DEPEND part needs to be kept in sync
-# with python_check_deps.
-DEPEND+=" $(python_gen_any_dep '
-	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-')"
-python_check_deps() {
-	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/beautifulsoup:4[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/jinja[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/ply[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-frameworks/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/gnome-icon-theme
-- x11-themes/tango-icon-theme
-"
-
-pkg_pretend() {
-	if [[ $(tc-getCC)$ == *gcc* ]] && \
-		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
-		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	if [[ "${SLOT}" == "0" ]]; then
-		CHROMIUM_SUFFIX=""
-	else
-		CHROMIUM_SUFFIX="-${SLOT}"
-	fi
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
-
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-system-ffmpeg-r3.patch"
-	epatch "${FILESDIR}/${PN}-system-jinja-r8.patch"
-	epatch "${FILESDIR}/${PN}-widevine-r1.patch"
-	epatch "${FILESDIR}/${PN}-last-commit-position-r0.patch"
-	epatch "${FILESDIR}/${PN}-snapshot-toolchain-r1.patch"
-
-	epatch_user
-
-	local conditional_bundled_libraries=""
-	if ! use system-ffmpeg; then
-		conditional_bundled_libraries+=" third_party/ffmpeg"
-	fi
-	if use gn; then
-		conditional_bundled_libraries+="
-			base/third_party/libevent
-			third_party/adobe
-			third_party/ffmpeg
-			third_party/flac
-			third_party/harfbuzz-ng
-			third_party/icu
-			third_party/jinja2
-			third_party/libjpeg_turbo
-			third_party/libpng
-			third_party/libwebp
-			third_party/libxml
-			third_party/libxslt
-			third_party/markupsafe
-			third_party/snappy
-			third_party/speech-dispatcher
-			third_party/usb_ids
-			third_party/xdg-utils
-			third_party/yasm
-			third_party/zlib
-		"
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py \
-		${conditional_bundled_libraries} \
-		'base/third_party/dmg_fp' \
-		'base/third_party/dynamic_annotations' \
-		'base/third_party/icu' \
-		'base/third_party/nspr' \
-		'base/third_party/superfasthash' \
-		'base/third_party/symbolize' \
-		'base/third_party/valgrind' \
-		'base/third_party/xdg_mime' \
-		'base/third_party/xdg_user_dirs' \
-		'breakpad/src/third_party/curl' \
-		'chrome/third_party/mozilla_security_manager' \
-		'courgette/third_party' \
-		'crypto/third_party/nss' \
-		'net/third_party/mozilla_security_manager' \
-		'net/third_party/nss' \
-		'third_party/WebKit' \
-		'third_party/analytics' \
-		'third_party/angle' \
-		'third_party/angle/src/third_party/compiler' \
-		'third_party/angle/src/third_party/libXNVCtrl' \
-		'third_party/angle/src/third_party/murmurhash' \
-		'third_party/angle/src/third_party/trace_event' \
-		'third_party/boringssl' \
-		'third_party/brotli' \
-		'third_party/cacheinvalidation' \
-		'third_party/catapult' \
-		'third_party/catapult/third_party/py_vulcanize' \
-		'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \
-		'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \
-		'third_party/catapult/tracing/third_party/components/polymer' \
-		'third_party/catapult/tracing/third_party/d3' \
-		'third_party/catapult/tracing/third_party/gl-matrix' \
-		'third_party/catapult/tracing/third_party/jszip' \
-		'third_party/cld_2' \
-		'third_party/cros_system_api' \
-		'third_party/cython/python_flags.py' \
-		'third_party/devscripts' \
-		'third_party/dom_distiller_js' \
-		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
-		'third_party/fips181' \
-		'third_party/flot' \
-		'third_party/google_input_tools' \
-		'third_party/google_input_tools/third_party/closure_library' \
-		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
-		'third_party/hunspell' \
-		'third_party/iccjpeg' \
-		'third_party/icu' \
-		'third_party/jstemplate' \
-		'third_party/khronos' \
-		'third_party/leveldatabase' \
-		'third_party/libXNVCtrl' \
-		'third_party/libaddressinput' \
-		'third_party/libjingle' \
-		'third_party/libphonenumber' \
-		'third_party/libpng' \
-		'third_party/libsecret' \
-		'third_party/libsrtp' \
-		'third_party/libudev' \
-		'third_party/libusb' \
-		'third_party/libvpx' \
-		'third_party/libvpx/source/libvpx/third_party/x86inc' \
-		'third_party/libxml/chromium' \
-		'third_party/libwebm' \
-		'third_party/libyuv' \
-		'third_party/lss' \
-		'third_party/lzma_sdk' \
-		'third_party/mesa' \
-		'third_party/modp_b64' \
-		'third_party/mt19937ar' \
-		'third_party/openh264' \
-		'third_party/openmax_dl' \
-		'third_party/opus' \
-		'third_party/ots' \
-		'third_party/pdfium' \
-		'third_party/pdfium/third_party/agg23' \
-		'third_party/pdfium/third_party/base' \
-		'third_party/pdfium/third_party/bigint' \
-		'third_party/pdfium/third_party/freetype' \
-		'third_party/pdfium/third_party/lcms2-2.6' \
-		'third_party/pdfium/third_party/libjpeg' \
-		'third_party/pdfium/third_party/libopenjpeg20' \
-		'third_party/pdfium/third_party/zlib_v128' \
-		'third_party/polymer' \
-		'third_party/protobuf' \
-		'third_party/qcms' \
-		'third_party/re2' \
-		'third_party/sfntly' \
-		'third_party/skia' \
-		'third_party/smhasher' \
-		'third_party/sqlite' \
-		'third_party/tcmalloc' \
-		'third_party/usrsctp' \
-		'third_party/web-animations-js' \
-		'third_party/webdriver' \
-		'third_party/webrtc' \
-		'third_party/widevine' \
-		'third_party/woff2' \
-		'third_party/x86inc' \
-		'third_party/zlib/google' \
-		'url/third_party/mozilla' \
-		'v8/src/third_party/fdlibm' \
-		'v8/src/third_party/valgrind' \
-		--do-remove || die
-}
-
-src_configure() {
-	local myconf_gyp=""
-	local myconf_gn=""
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf_gyp+=" -Ddisable_sse2=1"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gyp+=" -Ddisable_nacl=1"
-	myconf_gn+=" enable_nacl=false"
-
-	# Make it possible to remove third_party/adobe.
-	echo > "${T}/flapper_version.h" || die
-	myconf_gyp+=" -Dflapper_version_h_file=${T}/flapper_version.h"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_icu (bug #576370).
-	# TODO: use_system_libpng (bug #578212).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_libusb (http://crbug.com/266149).
-	# TODO: use_system_libvpx (http://crbug.com/494939).
-	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_re2 (bug #571156).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	myconf_gyp+="
-		-Duse_system_bzip2=1
-		-Duse_system_ffmpeg=$(usex system-ffmpeg 1 0)
-		-Duse_system_flac=1
-		-Duse_system_harfbuzz=1
-		-Duse_system_jsoncpp=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libwebp=1
-		-Duse_system_libxml=1
-		-Duse_system_libxslt=1
-		-Duse_system_minizip=1
-		-Duse_system_nspr=1
-		-Duse_system_snappy=1
-		-Duse_system_speex=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1"
-
-	# Needed for system icu - we don't need additional data files.
-	# myconf_gyp+=" -Dicu_use_data_file_flag=0"
-
-	# TODO: patch gyp so that this arm conditional is not needed.
-	if ! use arm; then
-		myconf_gyp+="
-			-Duse_system_yasm=1"
-	fi
-
-	# Optional dependencies.
-	# TODO: linux_link_kerberos, bug #381289.
-	myconf_gyp+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use gtk3)
-		$(gyp_use hangouts enable_hangout_services_extension)
-		$(gyp_use hidpi enable_hidpi)
-		$(gyp_use hotwording enable_hotwording)
-		$(gyp_use kerberos)
-		$(gyp_use pulseaudio)
-		$(gyp_use tcmalloc use_allocator tcmalloc none)
-		$(gyp_use widevine enable_widevine)"
-
-	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
-	# Use explicit library dependencies instead of dlopen.
-	# This makes breakages easier to detect by revdep-rebuild.
-	myconf_gyp+="
-		-Dlinux_link_gsettings=1
-		-Dlinux_link_libpci=1
-		-Dlinux_link_libspeechd=1
-		-Dlibspeechd_h_prefix=speech-dispatcher/"
-
-	# TODO: use the file at run time instead of effectively compiling it in.
-	myconf_gyp+="
-		-Dusb_ids_path=/usr/share/misc/usb.ids"
-
-	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
-	myconf_gyp+="
-		-Dlogging_like_official_build=1"
-
-	if [[ $(tc-getCC) == *clang* ]]; then
-		myconf_gyp+=" -Dclang=1"
-		myconf_gn+=" is_clang=true"
-	else
-		myconf_gyp+=" -Dclang=0"
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	myconf_gyp+="
-		-Dclang_use_chrome_plugins=0
-		-Dhost_clang=0
-		-Dlinux_use_bundled_binutils=0
-		-Dlinux_use_bundled_gold=0
-		-Dlinux_use_gold_flags=0
-		-Dsysroot="
-	myconf_gn+=" use_sysroot=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gyp+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	myconf_gyp+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
-		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		target_arch=x64
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		target_arch=ia32
-		ffmpeg_target_arch=ia32
-	elif [[ $myarch = arm64 ]] ; then
-		target_arch=arm64
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		target_arch=arm
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-		# TODO: re-enable NaCl (NativeClient).
-		local CTARGET=${CTARGET:-${CHOST}}
-		if [[ $(tc-is-softfloat) == "no" ]]; then
-
-			myconf_gyp+=" -Darm_float_abi=hard"
-		fi
-		filter-flags "-mfpu=*"
-		use neon || myconf_gyp+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
-
-		if [[ ${CTARGET} == armv[78]* ]]; then
-			myconf_gyp+=" -Darmv7=1"
-		else
-			myconf_gyp+=" -Darmv7=0"
-		fi
-		myconf_gyp+=" -Dsysroot=
-			$(gyp_use neon arm_neon)
-			-Ddisable_nacl=1"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	myconf_gyp+=" -Dtarget_arch=${target_arch}"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gyp+=" -Dwerror="
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gyp+=" -Ddisable_fatal_linker_warnings=1"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	# Tools for building programs to be executed on the build system, bug #410883.
-	if tc-is-cross-compiler; then
-		export AR_host=$(tc-getBUILD_AR)
-		export CC_host=$(tc-getBUILD_CC)
-		export CXX_host=$(tc-getBUILD_CXX)
-		export NM_host=$(tc-getBUILD_NM)
-	fi
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# TODO: also do this for GN bundled ffmpeg build.
-	if ! use system-ffmpeg && ! use gn; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gyp.py || die
-		popd > /dev/null || die
-	fi
-
-	third_party/libaddressinput/chromium/tools/update-strings.py || die
-
-	touch chrome/test/data/webui/i18n_process_css_test.html || die
-
-	einfo "Configuring Chromium..."
-	if use gn; then
-		tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn}" || die
-		out/Release/gn gen --args="${myconf_gn}" out/Release || die
-	else
-		build/linux/unbundle/replace_gyp_files.py ${myconf_gyp} || die
-		egyp_chromium ${myconf_gyp} || die
-	fi
-}
-
-eninja() {
-	if [[ -z ${NINJAOPTS+set} ]]; then
-		local jobs=$(makeopts_jobs)
-		local loadavg=$(makeopts_loadavg)
-
-		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-			NINJAOPTS+=" -j ${jobs}"
-		fi
-		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
-			NINJAOPTS+=" -l ${loadavg}"
-		fi
-	fi
-	set -- ninja -v ${NINJAOPTS} "$@"
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	local ninja_targets="chrome chrome_sandbox chromedriver"
-
-	if ! use gn; then
-		# Build mksnapshot and pax-mark it.
-		eninja -C out/Release mksnapshot || die
-		pax-mark m out/Release/mksnapshot
-	fi
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release ${ninja_targets} || die
-
-	pax-mark m out/Release/chrome
-}
-
-src_install() {
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome || die
-
-	newexe out/Release/chrome_sandbox chrome-sandbox || die
-	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-
-	doexe out/Release/chromedriver || die
-	use widevine && doexe out/Release/libwidevinecdmadapter.so
-
-	# if ! use arm; then
-	#	doexe out/Release/nacl_helper{,_bootstrap} || die
-	#	insinto "${CHROMIUM_HOME}"
-	#	doins out/Release/nacl_irt_*.nexe || die
-	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
-	# fi
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
-		sedargs+=(
-			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
-			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
-			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
-		)
-	fi
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
-
-	# Allow users to override command-line options, bug #357629.
-	dodir /etc/chromium || die
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default" || die
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin || die
-	doins out/Release/*.pak || die
-
-	doins out/Release/icudtl.dat || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
-	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser${CHROMIUM_SUFFIX}.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Chromium${CHROMIUM_SUFFIX}" \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	if use gnome; then
-		dodir /usr/share/gnome-control-center/default-apps || die
-		insinto /usr/share/gnome-control-center/default-apps
-		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
-		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
-			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
-				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
-		fi
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
diff --git a/www-servers/apache/apache-2.4.23.ebuild b/www-servers/apache/apache-2.4.23.ebuild
index 4c2f878ec4e8..9d254fac5219 100644
--- a/www-servers/apache/apache-2.4.23.ebuild
+++ b/www-servers/apache/apache-2.4.23.ebuild
@@ -125,7 +125,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 
 DEPEND+="apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )"
 
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 47e744c2f4d4..74aeddaa75ff 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -16,6 +16,7 @@ DIST NVIDIA-FreeBSD-x86-364.15.tar.gz 65676992 SHA256 ffbaef0ec723ca0c5e847cdbf9
 DIST NVIDIA-FreeBSD-x86-364.19.tar.gz 65807198 SHA256 5096640e9ad8a774fa76d0b64d94e209110fe58f472671f63ae21fc8bca0b376 SHA512 b2dba9f06464dab01e7fcf2e488d5df1be25feaf66c9138111f1ad6db50ef893783b53d16f8676a853971ccd354b06db4b7ee0a9c48fa757b8acaae9b7ff9df9 WHIRLPOOL 5c074ca0381159cf545ab4a9efb2e9e12822a071e2aa98e9ca2faff46a2d6f8d84e08543693dc3db9b93f617821e9a1787c9e3f5b40e60c1373ee693a4c36bdd
 DIST NVIDIA-FreeBSD-x86-367.18.tar.gz 66752524 SHA256 48f91a7f0ccc252f3812eba00facb5683b32087bf855ead9667135ba228e650d SHA512 70184e2feaa2546748e275aa8c4e69a692e542460f80636f21cfc29f63303c23e7c7d371d5fc4b15a2153ec9fff033ab1ca584e60eab930a72d146afbcf821f9 WHIRLPOOL d526280998a9a7290ff532a7b55aa1e8a76f289003283c1f2f3ca912d4397b8abeac23ec8ce957a2d0b64743514ce0a364b43203223d18ee5aaa379497f5a7fa
 DIST NVIDIA-FreeBSD-x86-367.27.tar.gz 62605521 SHA256 906038b40f46b2a5c8915b57aaeb0432eb4e60f6d156845e6e2afd49ec9d78b8 SHA512 166bd578b5536772e81f05f411e1bbdd2d9cd81f7210e96a388eff758bd1bb714fbf5dc2f3e4204e08e7555558e74901d6ad96607ee9c7b32ca4fe0b0cf373b5 WHIRLPOOL a31e9fe0e5817f1232a2dba8719110e9404f9b2feee4e0d6fe49ec50b63fd24852863670f0c36de357c9ed357738c30d1951e8fb1e6f40b5b2f8a1e2c7a8dc84
+DIST NVIDIA-FreeBSD-x86-367.35.tar.gz 62636433 SHA256 2edf78801213dea72ddd6c40acd860893623224166ad522fd47e202443cb6d50 SHA512 7b056814be81532dcf63bae13a55a3f190325c207e6e675151b01f655c861ec85804792a43b8c82a3e733394c92b336411ec4e2e70d308c70036f6625d55eb78 WHIRLPOOL a7768389f1e69b7a373e7e2a4cbcddb2f451a8b44346987ee898093c4c87c57a69744c1f7538fd41d1f81b44e02e505107f73c7584c07bce4104dc09349ece4c
 DIST NVIDIA-FreeBSD-x86-96.43.23.tar.gz 15463464 SHA256 18d855db8381eda1a6cf548c9e5095fc5bb8694bf1d6e24fc1072fba4e54cd78 SHA512 42d7b1b76cdb3b23680363e565614a22112162a5dd3639cb804fe670c0c3f3f23595bbefa3f78afdc6a8ca848446dee853c7a355f2c96a0d01b354753ba2785c WHIRLPOOL f8e59ce521990cd9edee441e73f973f074db492952807a0931e362102874cddbb47604ff5c5eb20a0cbde27f9b6d4e440dd12cc2e5a20c9cb65bf3c0b3e62511
 DIST NVIDIA-FreeBSD-x86_64-304.131.tar.gz 35812363 SHA256 e10aa34f4aeb6981c0bc6762f37e6ad57de52b45c7322d0caef9781c1a43858a SHA512 0df69d11c79cfd66f40f5adf091f9c3ad494b89fbe9200a1a01fef8cb2d2591ffdeb703d82a263e050384d39ef81af3a717ac24716f96b1fd8386d1758bcf45b WHIRLPOOL a7e01ac4646d52229efb1d22df9b4db98bfd6bc30c79fc4c65273001b1cd09c4db823a0141a060f8c53926ae23a33fe66e27aec805879228d64bf3f45aa66bcd
 DIST NVIDIA-FreeBSD-x86_64-340.93.tar.gz 60215584 SHA256 07208f6a832c2da8748b1c4f8b5ce42a7b617f2ee1ac59155fecaff952c30988 SHA512 c480df2f36c3d6eba53af9c3070e1561ae7c56cd5d31fb531dcb6897ca02d0d205c0ce99597304ea36b7b75b173e31a9a4c07ddd143ad13884aff0a7c3479bce WHIRLPOOL c1b28898ffe733961bdb622e8b430715c74871cfaab0348a9e5990df5a92676e8fb8c199ea1f1a06fa6c6ded65877b987b802a7a9ea0b7023cbaa62fb52eda01
@@ -34,6 +35,9 @@ DIST NVIDIA-FreeBSD-x86_64-364.15.tar.gz 62414805 SHA256 b675f4847c52a32ec4f3fe5
 DIST NVIDIA-FreeBSD-x86_64-364.19.tar.gz 62553892 SHA256 3b691c259b2a85da49d16ceab52b62363496fd764bbc3772e30c5f138a832ec3 SHA512 0e0cf1cea93a8e272bb7e7a939b73ea5a54888b0d4e870472cca92bc0f07ca7ec33616bf0a3f8f741167b7ffc173813574da541fdff83d66d19a230a07622b21 WHIRLPOOL 29945d058e24967afa4c5fdf71fb70f8bd8e0a80b6280d4a0ed47b27bf770da384ed04534681fa25869e3d2814400aafa0c57e44d6339ff2d16f5039ead04a4a
 DIST NVIDIA-FreeBSD-x86_64-367.18.tar.gz 63499863 SHA256 be862c654e290b32d78275d05fe38843b969e50f14d5e089ae800dab2a08b558 SHA512 565b606e006ce9263bb578501032aa19f3b55c76d4119f4ab5c6a6a6c0b872b8d7398dfa8d7ecc74609b9cea965e762eeffb9fa951aeb712632b0056c5fa637d WHIRLPOOL 60252d5d6b382108d6c0a52f404365f8d456fa2cc64dd4bfc008f1da74efff7905634141cf0f5a9b4c3513be414d8f20e310b7662057a3fa91ad128e0d3984c5
 DIST NVIDIA-FreeBSD-x86_64-367.27.tar.gz 59357230 SHA256 dea9bf156229b9353e033fa3cf02685c14e539d959d7c2759f233ad1f707f2d2 SHA512 3eb129723317d277c0788b966709369c382035e287e4e14000fae09b98bc12359e5218205a86abcb08894978343f3185986d643df3ceeb81b35ba475bb16b99f WHIRLPOOL a33ae3d01d953b090e169e651ff9cc478d91ea21753cbd4c806dc08898edbd078d191d91ae1f7d46dea8ba931bc63f722bb88e728e31cf98a7681c1d806bd1a5
+DIST NVIDIA-FreeBSD-x86_64-367.35.tar.gz 59393955 SHA256 b33057ce23ce1ae44ddd246a7d2d9e2b0aa2ed5a289d8a83e849249de81a1035 SHA512 724735dbe9a79edd50405b8ccd76bfca35d706b61f489fb57c6b7b71d070148ea97603abb96deab68df1c56e2a48e301eee75fc0de99b15b56d112660ef3bf14 WHIRLPOOL 690220131b40c8e84184c8fc0a5c4f511b44c84863f73b7610451ad9dbc6f563ce8b3b86b38b0f5b2311a2721288d788044c3477a4d76563effad1ed706cfa06
+DIST NVIDIA-Linux-armv7l-gnueabihf-367.27.run 25585174 SHA256 ae0855b247d5a5474561c76a79536fe82c44bd10e6154792978c5572d11c47f9 SHA512 dd60292f262e1d7d6cca09a35c3f8b65820d216d46f2b94feb208554496b30a983a73ffb8b2a1473cef0b7e08a3cda901eeca855e1db77f4f6dd23779772580b WHIRLPOOL c55d4102a6717f81d8bde7e66d1772c7b1f370d4d610ef61561c94f5ea6cc4797b5f15b9cbc31216b2ef9ef9132a66682b280d9ef5b74c4a57ee2ee8da6c1122
+DIST NVIDIA-Linux-armv7l-gnueabihf-367.35.run 25628654 SHA256 6087bd2cc594f860d27d26e30acd3593310ce00938c10e5729175f037efa222e SHA512 3157c3dc9d07dd0eb8aaa0bf21edf62aa1338f10c1431981494d2a7b1f0be8a1eee8b5bc41914cfca9b4c76773b0056e7ad5c80a4c7acadfadb52a7647baabbe WHIRLPOOL 49c8896d1a40e1f634224227100b303c3d2ebc66ee93f31aa18bc39c898585eba49400d148f47476e4253d35d7379047dbcf7f43cf027df0b16179bfc8912db0
 DIST NVIDIA-Linux-x86-173.14.39-pkg0.run 15134997 SHA256 a09935f37121ed3db8ae3da63a0d8e9d4348a19c859811c9fe44d6ce8e3eab23 SHA512 e24e15ccec725d3cbca502c2b77061776a81ef92917a950adec4ff6bdc34f10903aa654433177ea74be0dade4af81c5380d5710d375a5ea445940d06154bde93 WHIRLPOOL fce3d8e4f6cdf698f5a057514b6fe220bb1011025bdce5bd4cf0e424fb4d306d38251b6726bda03f290ea8137d5a95ed418cf8751722879f9042462abd9181b6
 DIST NVIDIA-Linux-x86-304.131.run 40893199 SHA256 d2554bb6f7867e7762d0ecedcac5bde7de0634e43b952bf466323ea8b4032da8 SHA512 3e67c40648554dc49472081eee88ae982c3b235b3346e4d9e7fb5ae33ec5f10ed088da804ac7d8bd1565995df3861f12b3560030cd3a19339a2d35768b0a943e WHIRLPOOL 88e9cc0270a4fc64ed8475a217c7c8c50e6ea21fe14b5b5beb16f494bd62bf5ada2f47e26e5380dd3d0bc678091e29f0e26937eef1ee3c7bdc5805153201bae3
 DIST NVIDIA-Linux-x86-340.93.run 38703394 SHA256 4a81c158302c595e1e72b5a1812eb3c67c8cf584ca74b1bc24163dad5289d612 SHA512 7507553bd4b11cac2cd882cd8afba59e773f58a26e67ee7e781c488be963a4f1eb54dcd72b40b29d33dd81c74d4748a76c1632b2c8ea08b524b4318c18b5dfe5 WHIRLPOOL 242190999da74f2fe4bfe4b223f43dec6ec73d97afd1e84e2c78c5fd5616d9814b647067ddf3f591ea8064d29234491de1c6f87b442e240d2aac4a1e598aefad
@@ -53,6 +57,7 @@ DIST NVIDIA-Linux-x86-364.15.run 49447690 SHA256 8fae0f29ab4bebf2b2e2d38e94adc31
 DIST NVIDIA-Linux-x86-364.19.run 50074922 SHA256 9f891d4b22c43c9094b59af5c8474e29c70813110b346834a5cad81a224d4112 SHA512 2b1cb0769d8c4d817588ab1071dbdbeda54291274392fd74009fc666bf198e6fcba1fe15db9d925a56ef98b147b48e58042a079b4f5773e95efe85531e25b01a WHIRLPOOL be7c48441e62c7038b58a3008dcb673f26607751ab62ab0197edf5d165b5d1ceb64ed654fd515746fe3cabe81d286e14b8343cf586cc5cb4ffcedf1f6df7eeeb
 DIST NVIDIA-Linux-x86-367.18.run 50290002 SHA256 9a5184308a981b1b36dde4466006b7b45ff4c2a2f364374b3835112899a55dbd SHA512 5124a68f757b2c511d1e44eaec7b7368df7c5808d4a1575d58f87ec70bff22ad5ef3d9fb936ec0673a34d58a8fb936c9564e18c04f5e766edaadb7012e2b687f WHIRLPOOL 35298c16b29907c9d13e05671e71befa066aaed805778b5268672c8506ce0293b4c78e941b90050ac1b4f9e4716fa57c7d1fcd7c18233a3c91538654d50651e5
 DIST NVIDIA-Linux-x86-367.27.run 44740794 SHA256 faa7c0f73c04a6d343a3952d264ec56fdf816cc6bf2a1c1bb95726401e99654b SHA512 54302f0de936a859561b756989ff84f73afe41dfb89ed680ee3df3c46b0de9d57eaf2d07876dea0eb1154fbc1a716d4d3e693cb7eaa7ab325b4bbee569ddb709 WHIRLPOOL b46005fa221f0e9b466168530ff08271c63d72a29ef1dea2831215aebd7b4f8dc2947d1f56f1fe490e4d809ed337f7f9116f0263f187dbb7f3d347378367a552
+DIST NVIDIA-Linux-x86-367.35.run 44717708 SHA256 38cb22fa85ef74ea960d3e5d644838cd961984ffc32bb0d052414cc7fa32e315 SHA512 3151995153a3c3857e291df933dbaeaad779544a39a9482980ccb89531ca924d71e6bf0e44767755c484c4b693cfaf01f55e61e3d82cef79f73c0b1964411f39 WHIRLPOOL ff85a42f339c59ceeaef0dc2c6ebc2a52c516fb09f05d16ad91e7c6f7d3368b8af717a2a716a1d606927a2bba689d755ce64b0d1e256ab809040c662cbb2f1da
 DIST NVIDIA-Linux-x86-96.43.23-pkg0.run 11504817 SHA256 51e6adf4ba73071622045fc37169f80db3ae3e784dff53b29d35146a04042142 SHA512 bed5726e57637481fe4e3c03a65ec14fe949f00860e729ebde408f4fd861d7bfdc296a78bc2f5d42e8b282db09f4bbde1e0545df7228fa20227080dc4b868ba7 WHIRLPOOL 6d4fd1786c11f4e326cc3101d0bb1a2f8b63c25c3dd59f10188f8355759e2861ce44fd53d60258b513d5a1d6124d0f91ba8edf4d3668b6feabfb3e8d585f14fe
 DIST NVIDIA-Linux-x86_64-173.14.39-pkg2.run 21100833 SHA256 15a953666d5681ba54c97498b578ffd286a1dc96d605f3b02110f3f99813100e SHA512 a65cd496e6ed57f771c3d99f37f616a1242d97844f6faef7a807825ad899c0e536a99fde397020839f0857883b934032f9491024f3047a6b06d3eea1f5d77713 WHIRLPOOL dc5f243b7d1de7e2d1b7f005e018a2940d63335b11a7c83c234b348b7a1839e9131169d2ea928bd8c2f549a4535149b03e16e6c94d59dfa745f7f904ff790a45
 DIST NVIDIA-Linux-x86_64-304.131.run 69415084 SHA256 74b7ec1c31dac03ee7c3e04612cadb9cbaa01ef4c796c27a0a649f7d32dccd0b SHA512 ddfa1f23600821dcae17ddb735b615d67504c4e276d9b41813e0f8d7690fbdf48f79644ee4c9e5449ce22a31460734cf325fc83975e0b48a0379a85cd4ef747d WHIRLPOOL fc08c2337a1b80b0444dbc914f7d17441995e4965c435028194050df9f5ec1606cdfb5bf11e56f79a736e04cf0755b296017fe79629c5ded18a72093b8689bce
@@ -73,6 +78,7 @@ DIST NVIDIA-Linux-x86_64-364.15.run 87191604 SHA256 4e7c6e35078960256551b581fdd5
 DIST NVIDIA-Linux-x86_64-364.19.run 87961023 SHA256 7b8680a815ac74d5b3a7e3d38113b05ed1e2ce781575e966c27f68457aaf694e SHA512 c02fea3eb0404e9f17eb6fdef43008c09653239b884fc599d3639f50a36b8d2708539c429e4b3be96d509c83ce5416145add7f152a3f08cada555617e9fcf1fc WHIRLPOOL 40c19fb5bfbc3a6b2c631e7768a04af9b250b4e8845adbf40b6408e2e7c6bb5b2b3142760387995c83450490e26591029d44aa8a6ee7a7b39a50128c7e4211af
 DIST NVIDIA-Linux-x86_64-367.18.run 88160263 SHA256 20d0e682ac2be862e574d3de5b3942c499e35c4608e13e85f7106e3d97948e47 SHA512 a2f1cfcfa20222a60a5f8f21b150cb46c938d9a5b2a6ff6f5955064b27749dad4243fe8a147e6892097fa8dabe17e8d9ef1ea37e9170d8feff88118af90460a0 WHIRLPOOL dba8653a0efa830d99a3f830d1db660a0f86c961ebb30a79dfb4b976bda910f16bd260ea08a2d5200127b7b142bdf5503ca2ff6159d708ac8eaa7a37c3c90471
 DIST NVIDIA-Linux-x86_64-367.27.run 76945324 SHA256 7b84583f8ed90b2b97ed4f9bbafac2b054da285fb94b37cfaadc5741cb442571 SHA512 d1aac4eb2e805054463cb974e4a4acf96a0404bf75de37188ccd0bd5a88916d003941b70f695216dee543b12779a38787c9675bbe03803ae15d6a48d1013ee28 WHIRLPOOL 8b71552e91eb37f1a3f6c0a11987471ef366fa97b4c580535ed35c8b650d3cb58ada09c5d1b4cdf803c5bdc3720df2f69c9e44153088861f2c78b55836559b7d
+DIST NVIDIA-Linux-x86_64-367.35.run 75600336 SHA256 d2df3fcb1a145984b9de4f2f38a90e353469e9d12279cf5e2c67c553b112d075 SHA512 18e2b1f342d1fc73c68f3c3ce526ab744fd7dd664cfd857849d497baf94eb057482d88444a792b64d3cd71ac624b9cbaae39b7f1884ca0370521cac0e5650d1b WHIRLPOOL 93612de22e0298383dfb16bf0f8893b55359a634c331b981fafebb1cd1a1dcfa602e1b35d2ff4a128b60753146bc494852410352be9309e531c78f62f708d8c3
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
 DIST nvidia-settings-304.131.tar.bz2 1480447 SHA256 d36d2d1ae7c1bb72cd18e713470546d2aa7057624b1f61319daf559a94054d29 SHA512 9269f54f87581e29e6d7cabeaf989c70cb27aa55f6b8f5f1c71b8a14401326d06ea194710722b41283cca56f5808b90a9b1fb12158d48c6332cce15a701c5796 WHIRLPOOL be8e38a09a0bfa40267b9cdae2800a9ef00a89e28e618b743b7acb0cd9ece4b242b74ced32018d735989592300b49b2ee683caa11a1e161bcecf070a58952dfd
 DIST nvidia-settings-340.96.tar.bz2 1551011 SHA256 af7303b070a4b41e388a7be6dfae17f020a5cc197170d4815b9a291a3a98aaff SHA512 fc6096338e48c347e4e854d06e8f63d8edb6527953996e63f3f70619be59d0436176547b5197ef30d18a82cf5b58dd775dcca4a2624107b63cce1ae589f2b154 WHIRLPOOL e7266ca0395aa1a5666a43bf6e54e258706d4e76bfd15079485e2379b332d2d6ba0c97b32e49f5b041340bb2d3c0e11dace702754ffc952c149557e0ab9d820a
@@ -88,3 +94,4 @@ DIST nvidia-settings-364.15.tar.bz2 1572733 SHA256 7c9c6d14a88dd60b079820459010d
 DIST nvidia-settings-364.19.tar.bz2 1573005 SHA256 fe8e9cc4d0ade9caaf51109e7e5287d1cbea111e73fae56f6c1b36ff8e55c370 SHA512 5274d908df284bc0ad2f7e6dd62c4052b2d0445e36dc84007bcb7c4e2382a8e9a4439e3507c229e96461031e1f3207911e659ddc73eea847052fa98b677f82c0 WHIRLPOOL dc93fc3635ff78b0a74d717a825ac630d38779f280c0d611fe43ff69adfda116c2363cb88cac1035d0169038ff4f82e51cd1b741cb5394e8e285cf5fe72ef046
 DIST nvidia-settings-367.18.tar.bz2 1572077 SHA256 035a45b3deca126596c1ac6088e13a72be62cc60d5b56f71978bb45ae67b6c14 SHA512 582158e12988b1588bcae0f116dbe814f96ebdd25b058be1222e5cecea894bed1b844ec2c4173fdd37a193543fc9f2f29dd7778c0c02ec5eb72d2672c5d774ca WHIRLPOOL ae49db45def98bb062788ec7a5ef0c21f0bc87ca6e7cd61ebeb0ededc0eb28ae83fc5dea2f6a6c90cac395c46c010251f010ff09655155eae0fcd12e1e18c4c9
 DIST nvidia-settings-367.27.tar.bz2 1572210 SHA256 d141d56a2e9b88686a391f97636df4834b5dda132726edf69f329bcfd9db5a4d SHA512 94a29cfff1b56b282be6802deb9d6b1b81a41f254464bf0ece567e6d7d708574ca111df32d82e4af68ac2b6bdfda387bb6113c60834fb084bf15582bff6a2273 WHIRLPOOL 4bd192d2cc316f1bae3af40ec8ae03c679aa128f0d3aaedb4a3dd1240503e6ea56d20248b7f6ec7d82e1ec972719cb9983cbc1af60263159ae9d42ed7b3f971f
+DIST nvidia-settings-367.35.tar.bz2 1572606 SHA256 6b0cf0b63bbf8c3d29538587bad8b639b42f8c9bac754bf5ca629df2054a0239 SHA512 9acba704118a8523ec92d26eb998a33755d334a8c5bbd72954ce9b9afbe2cfa63a5b572199e507bf8142dcda8f02a85517115bf07386e15fafe1915ace736770 WHIRLPOOL 644e950c22f686c00e59acc499f3c7af1578cdd45ddc8e4fe53b64abb8c703062e6f2a2548cf636359d52b294ef7e31589f06b7d3e71043d10554f4226169e17
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-367.27.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-367.27.ebuild
index d0a55c4a8afe..01d8a83fd817 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-367.27.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-367.27.ebuild
@@ -10,6 +10,7 @@ inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
 NV_URI="http://us.download.nvidia.com/XFree86/"
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
 AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
 X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
 AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
 
@@ -18,6 +19,7 @@ HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
 SRC_URI="
 	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
 	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	arm? ( ${NV_URI}Linux-x86-ARM/${PV}/${ARM_NV_PACKAGE}.run )
 	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
 	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
 	tools? ( ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2 )
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-367.35.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-367.35.ebuild
new file mode 100644
index 000000000000..01d8a83fd817
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-367.35.ebuild
@@ -0,0 +1,550 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
+	portability toolchain-funcs unpacker user udev
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	arm? ( ${NV_URI}Linux-x86-ARM/${PV}/${ARM_NV_PACKAGE}.run )
+	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
+	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+	tools? ( ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2 )
+"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV%.*}"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+RESTRICT="bindist mirror"
+EMULTILIB_PKG="true"
+
+IUSE="acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X"
+REQUIRED_USE="
+	tools? ( X )
+	static-libs? ( tools )
+"
+
+COMMON="
+	app-eselect/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		gtk3? ( x11-libs/gtk+:3 )
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+	)
+	X? (
+		>=app-eselect/eselect-opengl-1.0.9
+		app-misc/pax-utils
+	)
+"
+DEPEND="
+	${COMMON}
+	kernel_linux? ( virtual/linux-sources )
+"
+RDEPEND="
+	${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? ( !media-video/nvidia-settings )
+	wayland? ( dev-libs/wayland )
+	X? (
+		<x11-base/xorg-server-1.18.99:=
+		>=x11-libs/libvdpau-1.0
+		multilib? (
+			>=x11-libs/libX11-1.6.2[abi_x86_32]
+			>=x11-libs/libXext-1.3.2[abi_x86_32]
+		)
+	)
+"
+
+QA_PREBUILT="opt/* usr/lib*"
+
+S=${WORKDIR}/
+
+pkg_pretend() {
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if use kernel_linux && kernel_is ge 4 7; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-4.7"
+		ewarn "<sys-kernel/vanilla-sources-4.7"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Do not file a bug report about this."
+		ewarn ""
+	fi
+
+	# Since Nvidia ships many different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# Kernel features/options to check for
+	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
+	use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+
+	# Now do the above checks
+	use kernel_linux && check_extra_config
+}
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use driver && use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
+		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	if use kernel_linux && kernel_is lt 2 6 9; then
+		eerror "You must build this against 2.6.9 or higher kernels."
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_prepare() {
+	if use pax_kernel; then
+		ewarn "Using PAX patches is not supported. You will be asked to"
+		ewarn "use a standard kernel should you have issues. Should you"
+		ewarn "need support with these patches, contact the PaX team."
+		epatch "${FILESDIR}"/${PN}-364.12-pax.patch
+	fi
+
+	# Allow user patches so they can support RC kernels and whatever else
+	epatch_user
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use driver && use kernel_linux; then
+		MAKEOPTS=-j1 linux-mod_src_compile
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src \
+			AR="$(tc-getAR)" \
+			CC="$(tc-getCC)" \
+			LIBDIR="$(get_libdir)" \
+			NV_VERBOSE=1 \
+			RANLIB="$(tc-getRANLIB)" \
+			DO_STRIP= \
+			build-xnvctrl
+
+		emake -C "${S}"/nvidia-settings-${PV}/src \
+			CC="$(tc-getCC)" \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LD="$(tc-getCC)" \
+			LIBDIR="$(get_libdir)" \
+			NVML_ENABLED=0 \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			DO_STRIP=
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if it is not /usr/lib
+donvidia() {
+	# Full path to library
+	nv_LIB="${1}"
+
+	# SOVER to use
+	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
+
+	# Where to install
+	nv_DEST="${2}"
+
+	# Get just the library name
+	nv_LIBNAME=$(basename "${nv_LIB}")
+
+	if [[ "${nv_DEST}" ]]; then
+		exeinto ${nv_DEST}
+		action="doexe"
+	else
+		nv_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	fi
+
+	# Install the library
+	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
+
+	# If the library has a SONAME and SONAME does not match the library name,
+	# then we need to create a symlink
+	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
+		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} \
+			|| die "failed to create ${nv_DEST}/${nv_SOVER} symlink"
+	fi
+
+	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \
+		|| die "failed to create ${nv_LIBNAME/.so*/.so} symlink"
+}
+
+src_install() {
+	if use driver && use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+		doins "${FILESDIR}"/nvidia-rmmod.conf
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglx.so.${NV_SOVER} \
+			/usr/$(get_libdir)/opengl/nvidia/extensions
+
+		# Xorg nvidia.conf
+		if has_version '>=x11-base/xorg-server-1.16'; then
+			insinto /usr/share/X11/xorg.conf.d
+			newins {,50-}nvidia-drm-outputclass.conf
+		fi
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Documentation
+	dohtml ${NV_DOC}/html/*
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1"
+		use tools && doman "${NV_MAN}/nvidia-settings.1"
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}/nvidia-smi.1.gz"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
+		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
+		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+	fi
+
+	if use kernel_linux; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1.gz
+		doman nvidia-modprobe.1.gz
+		doman nvidia-persistenced.1.gz
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src/ \
+			DESTDIR="${D}" \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LIBDIR="${D}/usr/$(get_libdir)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			PREFIX=/usr \
+			DO_STRIP= \
+			install
+
+		if use static-libs; then
+			dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
+
+			insinto /usr/include/NVCtrl
+			doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+		fi
+
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+
+		insinto /etc/nvidia
+		newins \
+			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || \
+			doicon ${NV_OBJ}/nvidia-settings.png
+
+		domenu "${FILESDIR}"/nvidia-settings.desktop
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+
+		insinto /etc/vulkan/icd.d
+		doins nvidia_icd.json
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	if has_multilib_profile && use multilib; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	readme.gentoo_create_doc
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local libdir=${NV_OBJ}
+
+	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
+		libdir=${NV_OBJ}/32
+	fi
+
+	if use X; then
+		NV_GLX_LIBRARIES=(
+			"libEGL.so.1 ${GL_ROOT}"
+			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGL.so.$(usex compat ${NV_SOVER} 1.0.0) ${GL_ROOT}"
+			"libGLESv1_CM.so.1 ${GL_ROOT}"
+			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLESv2.so.2 ${GL_ROOT}"
+			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLX.so.0 ${GL_ROOT}"
+			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLdispatch.so.0 ${GL_ROOT}"
+			"libOpenCL.so.1.0.0 ${CL_ROOT}"
+			"libOpenGL.so.0 ${GL_ROOT}"
+			"libcuda.so.${NV_SOVER}"
+			"libnvcuvid.so.${NV_SOVER}"
+			"libnvidia-compiler.so.${NV_SOVER}"
+			"libnvidia-eglcore.so.${NV_SOVER}"
+			"libnvidia-encode.so.${NV_SOVER}"
+			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
+			"libnvidia-fbc.so.${NV_SOVER}"
+			"libnvidia-glcore.so.${NV_SOVER}"
+			"libnvidia-glsi.so.${NV_SOVER}"
+			"libnvidia-ifr.so.${NV_SOVER}"
+			"libnvidia-opencl.so.${NV_SOVER}"
+			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
+			"libvdpau_nvidia.so.${NV_SOVER}"
+		)
+
+		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-egl-wayland.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-wfb.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_FreeBSD; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_linux; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-ml.so.${NV_SOVER}"
+				"tls/libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
+			donvidia ${libdir}/${NV_LIB}
+		done
+	fi
+}
+
+pkg_preinst() {
+	if use driver && use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use driver && use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use driver && use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}