diff --git a/app-admin/ansible/ansible-1.9.3.ebuild b/app-admin/ansible/ansible-1.9.3.ebuild
index 7c8406c0dc4c..a08091ba13b4 100644
--- a/app-admin/ansible/ansible-1.9.3.ebuild
+++ b/app-admin/ansible/ansible-1.9.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild b/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild
index b21a1bbf6609..64f5ee66a285 100644
--- a/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild
+++ b/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,7 +7,7 @@ EAPI=5
 inherit cmake-utils
 
 DESCRIPTION="A system information and benchmark tool for Linux systems"
-HOMEPAGE="http://hardinfo.berlios.de/"
+HOMEPAGE="http://hardinfo.org/"
 SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/app-crypt/gnupg/gnupg-2.1.9.ebuild b/app-crypt/gnupg/gnupg-2.1.9.ebuild
index 4e192a18c3d2..71d0db3f87ad 100644
--- a/app-crypt/gnupg/gnupg-2.1.9.ebuild
+++ b/app-crypt/gnupg/gnupg-2.1.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tools usb"
 
 COMMON_DEPEND_LIBS="
diff --git a/app-emulation/virt-viewer/virt-viewer-2.0.ebuild b/app-emulation/virt-viewer/virt-viewer-2.0.ebuild
index b7bb8cae2608..bdad6c79f291 100644
--- a/app-emulation/virt-viewer/virt-viewer-2.0.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="sasl +spice +vnc"
 
 RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?]
diff --git a/app-misc/recoll/recoll-1.17.3-r1.ebuild b/app-misc/recoll/recoll-1.17.3-r1.ebuild
index 8e8e80d774d7..ead4dff26a33 100644
--- a/app-misc/recoll/recoll-1.17.3-r1.ebuild
+++ b/app-misc/recoll/recoll-1.17.3-r1.ebuild
@@ -5,7 +5,7 @@
 EAPI="4"
 
 PYTHON_DEPEND="2"
-inherit toolchain-funcs qt4-r2 linux-info python
+inherit toolchain-funcs qmake-utils qt4-r2 linux-info python
 
 DESCRIPTION="A personal full text search package"
 HOMEPAGE="http://www.lesbonscomptes.com/recoll/"
@@ -103,7 +103,7 @@ src_prepare() {
 src_configure() {
 	local qtconf
 
-	use qt4 && qtconf="QMAKEPATH=/usr/bin/qmake"
+	use qt4 && qtconf="QMAKEPATH=$(qt4_get_bindir)/qmake"
 
 	econf \
 		$(use_with spell aspell) \
diff --git a/app-misc/recoll/recoll-1.19.5.ebuild b/app-misc/recoll/recoll-1.19.5.ebuild
index 9c074c11139b..73b09064f1cf 100644
--- a/app-misc/recoll/recoll-1.19.5.ebuild
+++ b/app-misc/recoll/recoll-1.19.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="4"
 
 PYTHON_DEPEND="2"
-inherit toolchain-funcs qt4-r2 linux-info python readme.gentoo
+inherit toolchain-funcs qmake-utils qt4-r2 linux-info python readme.gentoo
 
 DESCRIPTION="A personal full text search package"
 HOMEPAGE="http://www.lesbonscomptes.com/recoll/"
@@ -116,7 +116,7 @@ src_configure() {
 	local qtconf
 
 	if use qt4 || use webkit; then
-		qtconf="QMAKEPATH=/usr/bin/qmake"
+		qtconf="QMAKEPATH=$(qt4_get_bindir)/qmake"
 	fi
 
 	econf \
diff --git a/app-shells/pdmenu/files/pdmenu-impl-dec.patch b/app-shells/pdmenu/files/pdmenu-impl-dec.patch
new file mode 100644
index 000000000000..c0cd7ce3ac99
--- /dev/null
+++ b/app-shells/pdmenu/files/pdmenu-impl-dec.patch
@@ -0,0 +1,16 @@
+ src/actions.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/actions.c b/src/actions.c
+index d42a63a..1f5a0d1 100644
+--- a/src/actions.c
++++ b/src/actions.c
+@@ -30,6 +30,8 @@
+ #include <libintl.h>
+ #define _(String) gettext (String)
+ 
++#include <ctype.h>
++
+ /* Handle a control c by either exiting pdmenu or doing nothing. */
+ void Handle_Ctrl_C() {
+   if (Q_Exits) {
diff --git a/app-text/html-xml-utils/html-xml-utils-6.9.ebuild b/app-text/html-xml-utils/html-xml-utils-6.9.ebuild
index bde783a2945a..486dec3e724a 100644
--- a/app-text/html-xml-utils/html-xml-utils-6.9.ebuild
+++ b/app-text/html-xml-utils/html-xml-utils-6.9.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="net-misc/curl"
diff --git a/dev-java/colt/colt-1.2.0-r2.ebuild b/dev-java/colt/colt-1.2.0-r2.ebuild
index 39bbe44a2736..037f0c5f0e00 100644
--- a/dev-java/colt/colt-1.2.0-r2.ebuild
+++ b/dev-java/colt/colt-1.2.0-r2.ebuild
@@ -18,9 +18,9 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.4
-		>=dev-java/concurrent-util-1.3.4:0"
+	>=dev-java/concurrent-util-1.3.4:0"
 RDEPEND=">=virtual/jre-1.4
-		 >=dev-java/concurrent-util-1.3.4:0"
+	>=dev-java/concurrent-util-1.3.4:0"
 
 S="${WORKDIR}/${PN}"
 
@@ -29,15 +29,15 @@ JAVA_ANT_REWRITE_CLASSPATH="true"
 EANT_GENTOO_CLASSPATH="concurrent-util"
 
 java_prepare() {
-	find "${S}" -iname '*.jar' -delete || die
+        find "${S}" -iname '*.jar' -delete || die
 
-	epatch "${FILESDIR}/${P}-benchmark-no-deprecation.patch"
+        epatch "${FILESDIR}/${P}-benchmark-no-deprecation.patch"
 }
 
 src_install() {
-	java-pkg_dojar lib/${PN}.jar
+        java-pkg_dojar lib/${PN}.jar
 
-	dohtml README.html || die
-	use doc && java-pkg_dojavadoc doc/api
-	use source && java-pkg_dosrc src/*
+        dohtml README.html || die
+        use doc && java-pkg_dojavadoc doc/api
+        use source && java-pkg_dosrc src/*
 }
diff --git a/dev-java/colt/colt-1.2.0-r3.ebuild b/dev-java/colt/colt-1.2.0-r3.ebuild
index d190857ba978..e9913890799b 100644
--- a/dev-java/colt/colt-1.2.0-r3.ebuild
+++ b/dev-java/colt/colt-1.2.0-r3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www-itg.lbl.gov/~hoschek/colt/"
 LICENSE="colt"
 IUSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=virtual/jdk-1.7"
 RDEPEND=">=virtual/jre-1.7"
diff --git a/dev-java/ehcache/Manifest b/dev-java/ehcache/Manifest
index 7a79ab44c1dc..dba8271673d2 100644
--- a/dev-java/ehcache/Manifest
+++ b/dev-java/ehcache/Manifest
@@ -1,2 +1 @@
-DIST ehcache-1.1.tgz 228733 SHA256 b1709cdb27a7dee9c3f6beb8967a2f64549d9cc32af7867f8fa43b0d5b4bf226 SHA512 15d37d4a2579fe1b720b87954a135307af34c42c6a925b13cca0f8d861e92c3802696480e3a8c3e478e905f0a231b0d93c135ff75fb934e7a968ba790713d9d5 WHIRLPOOL c32e92bae557e20cab01421104da3cba7f02654c8f262403fcd1f93598afb62570a14aadc3989a07a6de68ba8a34ad8dc04402b3a6a4f62f6fddc291e7aed34a
 DIST ehcache-1.2.4.tgz 1330344 SHA256 47b5dad87d8c75773e66aef471b1b464118956f8ce3bf9ca0e0292f020a20a64 SHA512 a8d3e7c47eeeab568fbe2f4b923db96cf0f93d8ae0f727aa107b0ce5c5abd035a3967ea58617ff10e9c81109dcb8d904cbad86ec2c77d9be159e1a0a2c44d4ed WHIRLPOOL ed7913a200c45119f565912118b1b7c9e9e6ffc29fe8e227c7eca3d66f2333636d214af6e39ba9cf41c6eb0cf4568e26e1b511c06b66b3abdde8a6cba814178e
diff --git a/dev-java/ehcache/ehcache-1.1-r1.ebuild b/dev-java/ehcache/ehcache-1.1-r1.ebuild
deleted file mode 100644
index bd6ead79108b..000000000000
--- a/dev-java/ehcache/ehcache-1.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Ehcache is a pure Java, fully-featured, in-process cache"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-HOMEPAGE="http://ehcache.sourceforge.net"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc"
-
-COMMON_DEPEND="
-		dev-java/commons-collections
-		dev-java/concurrent-util
-		dev-java/commons-logging"
-RDEPEND=">=virtual/jre-1.4
-		${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.4
-		${COMMON_DEPEND}
-		>=dev-java/ant-core-1.5"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	unzip ${P}-src.zip || die
-	rm *.jar
-	rm -rf src/net/sf/ehcache/hibernate
-}
-
-src_compile() {
-	mkdir "${S}"/classes
-	cd "${S}"/src
-
-	ejavac -d "${S}"/classes \
-		-classpath 	$(java-pkg_getjars commons-logging,commons-collections) \
-		$(find . -name "*.java")
-
-	cd "${S}"/classes
-	jar cf "${S}"/${P}.jar * || die
-}
-
-src_install() {
-	java-pkg_newjar "${S}"/${P}.jar ${PN}.jar
-	dodoc *.txt ehcache.xml ehcache.xsd
-	if use doc ; then
-		unzip ${P}-javadoc.zip || die
-		java-pkg_dohtml -r docs
-	fi
-}
diff --git a/dev-java/ehcache/ehcache-1.1-r2.ebuild b/dev-java/ehcache/ehcache-1.1-r2.ebuild
deleted file mode 100644
index 2737962129e4..000000000000
--- a/dev-java/ehcache/ehcache-1.1-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Ehcache is a pure Java, fully-featured, in-process cache"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-HOMEPAGE="http://ehcache.sourceforge.net"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE=""
-
-COMMON_DEPEND="
-		dev-java/commons-collections:0
-		dev-java/concurrent-util:0
-		dev-java/commons-logging:0"
-RDEPEND=">=virtual/jre-1.4
-		${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.4
-		app-arch/zip
-		${COMMON_DEPEND}
-		>=dev-java/ant-core-1.5"
-
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH="commons-collections,concurrent-util,commons-logging"
-
-java_prepare() {
-	unzip ${P}-src.zip || die
-	rm *.jar || die
-	rm -rf src/net/sf/ehcache/hibernate || die
-}
diff --git a/dev-java/fec/Manifest b/dev-java/fec/Manifest
index d85a1e356a5b..d77a48e4c768 100644
--- a/dev-java/fec/Manifest
+++ b/dev-java/fec/Manifest
@@ -1 +1,2 @@
 DIST fec-1.0.4.tar.bz2 611131 SHA256 978d0ef609ec334ea85e3f70e46a94f6c2cc04393b590a2addfc74e03634b8dd SHA512 45e33fc4b71fcd78a7c5310f2b58df8b83a988500d0de7efebbeade712f5c93d57bbe63fd7dc148ccb1cc6418fc9c79e27be6fe0512e2294c289b192c01ab871 WHIRLPOOL cef5de5b24ddc33f6a85581cd149d3c5887f8f49843df5918158d137b263a58b888149fe68e293bc697db0b7b74e3952fabc1842f8b8f80932de379f2c7bf0d2
+DIST fec-1.0.4.tar.gz 449406 SHA256 b33f5558f53e1abd9a4e58b5898cd605607698f22679f577f5fdf6cb1a2dd48a SHA512 0244de5e44ab108e921c6ca4cf341ce7b3ba807a76d24b768cfe3de71ffd525c9ebf389f9981e7eaa83fec301a65ba60ef4f51c5b3befa6c7af42b793d430343 WHIRLPOOL 3179b18a341b65b6cd295cf5f716887f8c90f03f81017444468dd57220afa4c4e58c5112fd4ef898d4f7fd7a307eb5846ffed6bead8d13fedfc30dc41fbb23d5
diff --git a/dev-java/fec/fec-1.0.4-r2.ebuild b/dev-java/fec/fec-1.0.4-r2.ebuild
new file mode 100644
index 000000000000..f589f89eb993
--- /dev/null
+++ b/dev-java/fec/fec-1.0.4-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit flag-o-matic toolchain-funcs java-pkg-2 java-ant-2
+
+DESCRIPTION="Forward Error Correction library in Java"
+HOMEPAGE="https://bitbucket.org/onionnetworks/"
+SRC_URI="http://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/log4j:0"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/"${P}-libfec8path.patch"
+	"${FILESDIR}"/"${P}-build.patch"
+	"${FILESDIR}"/"${P}-soname.patch"
+	"${FILESDIR}"/"${P}-remove-concurrent-util-imports.patch"
+)
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="log4j"
+EANT_BUILD_TARGET="jars"
+
+# There seems to be unit tests, but they are in such a state.
+RESTRICT="test"
+
+java_prepare() {
+	# In fact, we'll wipe tests altogether.
+	rm -rf tests || die
+
+	# Apply patches.
+	epatch "${PATCHES[@]}"
+
+	# Get rid of bundled jars.
+	java-pkg_clean
+}
+
+src_compile() {
+	java-pkg-2_src_compile
+	einfo "Sucessfully compiled Java classes!"
+
+	cd "${S}"/src/csrc || die
+	append-flags -fPIC
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS} $(java-pkg_get-jni-cflags)" || die
+	einfo "Sucessfully compiled C files!"
+}
+
+src_install() {
+	java-pkg_newjar "lib/onion-${PN}.jar" "${PN}.jar"
+	use doc && java-pkg_dojavadoc javadoc
+	use source && java-pkg_dosrc src/com
+	dolib.so src/csrc/libfec{8,16}.so || die
+}
diff --git a/dev-java/fec/files/fec-1.0.4-build.patch b/dev-java/fec/files/fec-1.0.4-build.patch
index 3920dcec4c7d..c47eb5459045 100644
--- a/dev-java/fec/files/fec-1.0.4-build.patch
+++ b/dev-java/fec/files/fec-1.0.4-build.patch
@@ -1,8 +1,6 @@
-Index: csrc/Makefile
-===================================================================
---- src/csrc.orig/Makefile
-+++ src/csrc/Makefile
-@@ -28,11 +28,8 @@ fec8-jinterf.o: fec-jinterf.c
+--- src/csrc/Makefile.orig	2015-10-18 14:31:56.752486000 +0000
++++ src/csrc/Makefile	2015-10-18 14:33:11.502486000 +0000
+@@ -28,11 +28,8 @@
  		-I$(JAVA_HOME)/include/linux fec-jinterf.c \
  		-o fec8-jinterf.o
  
@@ -16,7 +14,7 @@ Index: csrc/Makefile
  
  libfec16.so: fec16.o fec16-jinterf.o
  	$(CC) $(LDFLAGS) -shared fec16-jinterf.o fec16.o -o libfec16.so
-@@ -42,11 +39,8 @@ fec16-jinterf.o: fec-jinterf.c
+@@ -42,11 +39,8 @@
  		-I$(JAVA_HOME)/include/linux fec-jinterf.c \
  		-o fec16-jinterf.o
  
diff --git a/dev-java/fec/files/fec-1.0.4-libfec8path.patch b/dev-java/fec/files/fec-1.0.4-libfec8path.patch
index 503db7c837eb..58eb89efb730 100644
--- a/dev-java/fec/files/fec-1.0.4-libfec8path.patch
+++ b/dev-java/fec/files/fec-1.0.4-libfec8path.patch
@@ -1,5 +1,5 @@
---- src/com/onionnetworks/fec/Native8Code.java	2009-08-21 02:37:00.515004583 +0200
-+++ src/com/onionnetworks/fec/Native8Code.java.new	2009-08-21 02:37:57.829254678 +0200
+--- src/com/onionnetworks/fec/Native8Code.java.orig	2015-10-18 14:27:06.160486000 +0000
++++ src/com/onionnetworks/fec/Native8Code.java	2015-10-18 14:30:32.557486000 +0000
 @@ -3,6 +3,7 @@
  //import java.security.AccessController;
  //import sun.security.action.*;
@@ -16,14 +16,15 @@
 -            (Native8Code.class.getClassLoader(),"fec8");
 -        if (path != null) {
 -            System.load(path);
-+       File path = new File("/usr/lib/libfec8.so");
-+       System.out.println("Loading FEC lib ["+path.getAbsolutePath()+']');
-+       System.load(path.getAbsolutePath());
-             initFEC();
+-            initFEC();
 -        } else {
 -            System.out.println("Unable to find native library for fec8 for platform "+NativeDeployer.OS_ARCH);
 -            System.out.println(path);
 -        }
++        File path = new File("/usr/lib/libfec8.so");
++		 System.out.println("Loading FEC lib ["+path.getAbsolutePath()+']');
++        System.load(path.getAbsolutePath());
++        initFEC();
      }
  
      public Native8Code(int k, int n) {
diff --git a/dev-java/fec/files/fec-1.0.4-remove-concurrent-util-imports.patch b/dev-java/fec/files/fec-1.0.4-remove-concurrent-util-imports.patch
new file mode 100644
index 000000000000..87a9473ed937
--- /dev/null
+++ b/dev-java/fec/files/fec-1.0.4-remove-concurrent-util-imports.patch
@@ -0,0 +1,101 @@
+--- src/com/onionnetworks/fec/io/FECFile.java.orig	2015-10-18 15:38:26.000000000 +0000
++++ src/com/onionnetworks/fec/io/FECFile.java	2015-10-18 16:06:51.159486000 +0000
+@@ -10,7 +10,9 @@
+ import com.onionnetworks.fec.FECCodeFactory;
+ import com.onionnetworks.io.RAF;
+ import com.onionnetworks.util.*;
+-import EDU.oswego.cs.dl.util.concurrent.*;
++
++import java.util.concurrent.locks.ReadWriteLock;
++import java.util.concurrent.locks.ReentrantReadWriteLock;
+ 
+ /**
+  * This class provides the necessary file IO routines to go along with the raw
+@@ -129,9 +131,9 @@
+         this.raf = new RAF(f,mode); // synched RandomAccessFile        
+ 
+         // Create the locks.
+-        locks = new ReadWriteLock[blockCount];
++        locks = new ReentrantReadWriteLock[blockCount];
+         for (int i=0;i<locks.length;i++) {
+-            locks[i] = new ReentrantWriterPreferenceReadWriteLock();
++            locks[i] = new ReentrantReadWriteLock();
+         }
+ 
+         // add the default exception handler.
+@@ -258,7 +260,7 @@
+         byte[] b = null;
+ 
+         try {
+-            locks[blockNum].readLock().acquire();
++            locks[blockNum].readLock().lock();
+ 	    try {
+ 
+                 // This raf check then pp access is safe because all
+@@ -296,9 +298,9 @@
+                     return;
+                 }
+ 	    } finally {
+-                locks[blockNum].readLock().release();
++                locks[blockNum].readLock().unlock();
+ 	    }
+-	} catch (InterruptedException e) { 
++	} catch (Exception e) { 
+ 	    throw new InterruptedIOException(e.toString());
+ 	}
+         
+@@ -342,13 +344,13 @@
+ 	
+         int result = -1;
+         try {
+-            locks[blockNum].writeLock().acquire();
++            locks[blockNum].writeLock().lock();
+ 	    try {
+                 result = write0(pkt,blockNum,stripeNum);
+ 	    } finally {
+-                locks[blockNum].writeLock().release();
++                locks[blockNum].writeLock().unlock();
+ 	    }
+-	} catch (InterruptedException e) { 
++	} catch (Exception e) { 
+ 	    throw new InterruptedIOException(e.toString());
+ 	}
+ 
+@@ -444,16 +446,16 @@
+ 	}
+ 
+ 	try {
+-	    locks[blockNum].writeLock().acquire();
++	    locks[blockNum].writeLock().lock();
+ 	    try {
+ 		// seek and write the decoded block.
+ 		raf.seekAndWrite(blockNum*blockSize,b,0,b.length);
+ 		// Update the placement to show decoded entries.
+ 		pp.setBlockDecoded(blockNum);
+ 	    } finally {
+-		locks[blockNum].writeLock().release();
++		locks[blockNum].writeLock().unlock();
+ 	    }
+-	} catch (InterruptedException e) { 
++	} catch (Exception e) { 
+ 	    throw new InterruptedIOException(e.toString());
+ 	}
+ 	 
+@@ -468,7 +470,7 @@
+      */
+     public void acquireAllWriteLocks() throws InterruptedException {
+         for (int i=0;i<locks.length;i++) {
+-            locks[i].writeLock().acquire();
++            locks[i].writeLock().lock();
+         }
+     }
+ 
+@@ -479,7 +481,7 @@
+      */
+     public void releaseAllWriteLocks() throws InterruptedException {
+         for (int i=0;i<locks.length;i++) {     
+-            locks[i].writeLock().release();
++            locks[i].writeLock().unlock();
+         }   
+     }
+ 
diff --git a/dev-java/log4j/log4j-1.2.17-r3.ebuild b/dev-java/log4j/log4j-1.2.17-r3.ebuild
new file mode 100644
index 000000000000..1da34e9694ef
--- /dev/null
+++ b/dev-java/log4j/log4j-1.2.17-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A low-overhead robust logging package for Java"
+SRC_URI="mirror://apache/logging/${PN}/${PV}/${P}.tar.gz"
+HOMEPAGE="http://logging.apache.org/log4j/"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="javamail jms"
+
+CDEPEND="javamail? (
+			dev-java/oracle-javamail:0
+			java-virtuals/jaf:0
+		)
+		jms? (
+			java-virtuals/jms:0
+		)"
+
+RDEPEND=">=virtual/jre-1.6
+		${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+		${CDEPEND}"
+
+MY_P="apache-${P}"
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	rm -rf dist || die
+	java-pkg_filter-compiler jikes
+	rm -v *.jar || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
+EANT_BUILD_TARGET="log4j.jar"
+EANT_EXTRA_ARGS="-Djaxp-present=true -Djmx-present=true"
+EANT_DOC_TARGET=""
+
+src_compile() {
+	if use javamail; then
+		EANT_GENTOO_CLASSPATH+="oracle-javamail,jaf"
+		EANT_EXTRA_ARGS+=" -Djavamail-present=true"
+	fi
+	if use jms; then
+		EANT_EXTRA_ARGS+=" -Djms-present=true -Djms.jar=$(java-pkg_getjars jms)"
+	fi
+
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	java-pkg_newjar dist/lib/${PN}-1.2.17.jar ${PN}.jar
+
+	if use doc ; then
+		java-pkg_dohtml -r site/*
+		rm -fr "${ED}/usr/share/doc/${PF}/html/apidocs"
+		java-pkg_dojavadoc --symlink apidocs site/apidocs
+	fi
+
+	if use source; then
+		java-pkg_dosrc src/main/java/*
+	fi
+}
diff --git a/dev-libs/npth/npth-1.1.ebuild b/dev-libs/npth/npth-1.1.ebuild
index 8084a24c56a3..c337d0ccf373 100644
--- a/dev-libs/npth/npth-1.1.ebuild
+++ b/dev-libs/npth/npth-1.1.ebuild
@@ -11,5 +11,5 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="static-libs"
diff --git a/dev-libs/npth/npth-1.2.ebuild b/dev-libs/npth/npth-1.2.ebuild
index d925771f714d..d9dc362728ce 100644
--- a/dev-libs/npth/npth-1.2.ebuild
+++ b/dev-libs/npth/npth-1.2.ebuild
@@ -11,5 +11,5 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static-libs"
diff --git a/dev-lisp/asdf/Manifest b/dev-lisp/asdf/Manifest
index c962b2fd861c..24c5b9b14d6e 100644
--- a/dev-lisp/asdf/Manifest
+++ b/dev-lisp/asdf/Manifest
@@ -1,6 +1,7 @@
 DIST asdf-3.0.3.tar.gz 427575 SHA256 05f11d83d33f1080f683701ad0e139011051f9c3190c3b1f22bc63208d8d5f47 SHA512 d9d8d466c7b6aa6beb1c22da4fd10499fa784c39ab138bea7ecb8cdccf769766572ebe91c89db2d5c53e493096248f82a224be95c1fcac8b7beebe1b57f34883 WHIRLPOOL 3503250361350b59d095b743dcc627e9ec1e3ec469066287b80d97924d54ea254fed94f77596ed71b4c9974e4c9b97de8b6a35b3c6529f559d6ba392b695ccf4
 DIST asdf-3.1.4.tar.gz 831537 SHA256 bc8bfaf36335e5f01fd08159c1ded5a96088fbea002b466bdf95c129c413cc43 SHA512 c48eb0928d3b98154d63e8ce797baeb4ad51ab685594b80f2ec4db9747b41c619ec17856d2483590ca8bd0b8c9db160837e7e49e72396c3a16db338ea985282c WHIRLPOOL 71babc996c326b6fb0118752a0f60601f9cefb28d254fd48c838abae14e7bc02f8831a5e96e9521b95f52b9bc1bb632fb5d93abed11dea480ba9f007e7cfdbf1
 DIST asdf-3.1.5.tar.gz 400359 SHA256 3005aa50470feefc3f786e4e300f275bef3d3662ed1904fd25a22552e4cc59ad SHA512 937d45eabea0853cd1b2e78e84cf33e7b55065857ffcf49fd87ccd60e21ae09c6dc7ab3649d48b37aeb1beaeeaf6c816e5ce035f0283707105296fb976044516 WHIRLPOOL 730e55f875367d190a893b52663bcf35ed5880715ef696d519d35947b82f8a304c94a46294f48c4403c1583895f41a03955510c92848a7290d1d681ab3214e24
+DIST asdf-3.1.6.tar.gz 396066 SHA256 1c15f8db038ace781fa5e6f0cf045b06f6315c715c55d8bcc185238182bb6514 SHA512 3203bef1ce4c2d28306ca1ee214d3d5fd04b3d2caa61f606d0334f100358bfbd9b03d69c95e83734175639a91e76aeac509e949768fc694817631078671a9bc1 WHIRLPOOL 52a4a62f17d54c638a3f3ed4c42804c64e34a86c8df5bf0e118ff478c38c1558adb8751a987b97093ec5adc0f7a6c951f9c563ef7549fc7591fdffd9a7aa1212
 DIST cl-asdf_1.86-1.diff.gz 4888 SHA256 ac7c526a4471353cff3fc2ae750693cf5a9a35c6dca1e52d04e9fd17d76082c8 SHA512 9aa905a14e814a9c7e8077d09aca238d735511ae67f0197fffc84100f5500950081bc00f5be7c6838e3a58d9e4c2f5b6fce9e41d84c7e39fb4fb2e04a1482abf WHIRLPOOL 86a88af4124e9e822c899f23400d054fd915365a825017fdf1ad0b6a26e121cbfe80639f65b018dbc7012173a40c88a31b287c96919184e050feb809ba86bd12
 DIST cl-asdf_1.86.orig.tar.gz 53686 SHA256 cfee04493fe4b8a70a42e3ed79d927c3551878c8685ba7c8cf557341453421ce SHA512 a62ff032b41d60b3afbd1f1ef85ea52d669a6fdd87371b19364dec98e99a01e134242bd0b0d6e8731c8d89feab78b809b740a533a46ff21a3969ef0f7dd1e65c WHIRLPOOL c1943361d8e396d9ec602428b91622a023f7743553c4a8d8316ac6b472e11ef1bc3ad3e65644e2d492932c8eb7d02bf596f465e48b6e6714ee4af957459754d2
 DIST cl-asdf_1.89-1.diff.gz 395 SHA256 1ad2de4d9bb494f58e69f327d02cd86100967371c93727393b99b3b6fd20d567 SHA512 0d5ac51e69914b58497815971f1736712bd65988944fff5966f854c2dd22d1969d9237c996bfd44a6195d2765db9af07c3055c9bf126ba25059eccdbf8da20b4 WHIRLPOOL 20bc02a86d3645bedf1952ef70193f3b52250dcab5720e21940f0721e2c8be330f8452d4f77c82cc7bb105afb935c3b255e435b5d99ac40965c49621082c0f4b
diff --git a/dev-lisp/asdf/asdf-3.1.6.ebuild b/dev-lisp/asdf/asdf-3.1.6.ebuild
new file mode 100644
index 000000000000..c3a2d398ab72
--- /dev/null
+++ b/dev-lisp/asdf/asdf-3.1.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils prefix
+
+DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp"
+HOMEPAGE="http://common-lisp.net/project/asdf/"
+SRC_URI="http://common-lisp.net/project/${PN}/archives/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="doc"
+
+SLOT="0/${PVR}"
+
+DEPEND="!dev-lisp/cl-${PN}
+		!dev-lisp/asdf-binary-locations
+		!dev-lisp/gentoo-init
+		!<dev-lisp/asdf-2.33-r3
+		doc? ( virtual/texi2dvi )"
+RDEPEND=""
+PDEPEND="~dev-lisp/uiop-${PV}"
+
+#S="${WORKDIR}"
+
+src_compile() {
+	make
+	use doc && make doc
+}
+
+src_install() {
+	insinto /usr/share/common-lisp/source/${PN}
+	doins -r build version.lisp-expr
+	dodoc README.md TODO
+	dohtml doc/*.{html,css,ico,png}
+	if use doc; then
+		dohtml -r doc/index.html
+		insinto /usr/share/doc/${PF}
+		#doins doc/${PN}.pdf
+	fi
+
+	insinto /etc/common-lisp
+	cd "${T}"
+	cp "${FILESDIR}"/gentoo-init.lisp "${FILESDIR}"/source-registry.conf .
+	eprefixify gentoo-init.lisp source-registry.conf
+	doins gentoo-init.lisp source-registry.conf
+}
diff --git a/dev-lisp/uiop/Manifest b/dev-lisp/uiop/Manifest
index 130d4ff66a9f..e982724ca4c5 100644
--- a/dev-lisp/uiop/Manifest
+++ b/dev-lisp/uiop/Manifest
@@ -1,3 +1,4 @@
 DIST asdf-3.0.3.tar.gz 427575 SHA256 05f11d83d33f1080f683701ad0e139011051f9c3190c3b1f22bc63208d8d5f47 SHA512 d9d8d466c7b6aa6beb1c22da4fd10499fa784c39ab138bea7ecb8cdccf769766572ebe91c89db2d5c53e493096248f82a224be95c1fcac8b7beebe1b57f34883 WHIRLPOOL 3503250361350b59d095b743dcc627e9ec1e3ec469066287b80d97924d54ea254fed94f77596ed71b4c9974e4c9b97de8b6a35b3c6529f559d6ba392b695ccf4
 DIST asdf-3.1.4.tar.gz 831537 SHA256 bc8bfaf36335e5f01fd08159c1ded5a96088fbea002b466bdf95c129c413cc43 SHA512 c48eb0928d3b98154d63e8ce797baeb4ad51ab685594b80f2ec4db9747b41c619ec17856d2483590ca8bd0b8c9db160837e7e49e72396c3a16db338ea985282c WHIRLPOOL 71babc996c326b6fb0118752a0f60601f9cefb28d254fd48c838abae14e7bc02f8831a5e96e9521b95f52b9bc1bb632fb5d93abed11dea480ba9f007e7cfdbf1
 DIST asdf-3.1.5.tar.gz 400359 SHA256 3005aa50470feefc3f786e4e300f275bef3d3662ed1904fd25a22552e4cc59ad SHA512 937d45eabea0853cd1b2e78e84cf33e7b55065857ffcf49fd87ccd60e21ae09c6dc7ab3649d48b37aeb1beaeeaf6c816e5ce035f0283707105296fb976044516 WHIRLPOOL 730e55f875367d190a893b52663bcf35ed5880715ef696d519d35947b82f8a304c94a46294f48c4403c1583895f41a03955510c92848a7290d1d681ab3214e24
+DIST asdf-3.1.6.tar.gz 396066 SHA256 1c15f8db038ace781fa5e6f0cf045b06f6315c715c55d8bcc185238182bb6514 SHA512 3203bef1ce4c2d28306ca1ee214d3d5fd04b3d2caa61f606d0334f100358bfbd9b03d69c95e83734175639a91e76aeac509e949768fc694817631078671a9bc1 WHIRLPOOL 52a4a62f17d54c638a3f3ed4c42804c64e34a86c8df5bf0e118ff478c38c1558adb8751a987b97093ec5adc0f7a6c951f9c563ef7549fc7591fdffd9a7aa1212
diff --git a/dev-lisp/uiop/uiop-3.1.6.ebuild b/dev-lisp/uiop/uiop-3.1.6.ebuild
new file mode 100644
index 000000000000..f6cf4876c1bc
--- /dev/null
+++ b/dev-lisp/uiop/uiop-3.1.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="UIOP is a portability layer spun off ASDF3"
+HOMEPAGE="http://common-lisp.net/project/asdf/"
+SRC_URI="http://common-lisp.net/project/asdf/archives/asdf-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="~dev-lisp/asdf-${PV}"
+
+S="${WORKDIR}/asdf-${PV}/${PN}"
+
+src_install() {
+	insinto /usr/share/common-lisp/source/${PN}
+	doins -r contrib *.lisp ../version.lisp-expr uiop.asd asdf-driver.asd
+	dodir /usr/share/common-lisp/systems
+	dosym /usr/share/common-lisp/source/${PN}/uiop.asd /usr/share/common-lisp/systems/uiop.asd
+	dosym /usr/share/common-lisp/source/${PN}/asdf-driver.asd /usr/share/common-lisp/systems/asdf-driver.asd
+}
diff --git a/dev-ml/ocaml-cstruct/ocaml-cstruct-1.7.0-r2.ebuild b/dev-ml/ocaml-cstruct/ocaml-cstruct-1.7.0-r3.ebuild
similarity index 96%
rename from dev-ml/ocaml-cstruct/ocaml-cstruct-1.7.0-r2.ebuild
rename to dev-ml/ocaml-cstruct/ocaml-cstruct-1.7.0-r3.ebuild
index 9b44e6f97058..647990bf3475 100644
--- a/dev-ml/ocaml-cstruct/ocaml-cstruct-1.7.0-r2.ebuild
+++ b/dev-ml/ocaml-cstruct/ocaml-cstruct-1.7.0-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
-IUSE="async +camlp4 lwt"
+IUSE="async +camlp4 +lwt"
 
 RDEPEND="
 	async? ( dev-ml/async:= )
diff --git a/dev-ml/ocaml-dns/Manifest b/dev-ml/ocaml-dns/Manifest
new file mode 100644
index 000000000000..01f2a439d1b9
--- /dev/null
+++ b/dev-ml/ocaml-dns/Manifest
@@ -0,0 +1 @@
+DIST ocaml-dns-0.15.3.tar.gz 143042 SHA256 cc1361e51d1a7b6fa8d552dc06cad09288ba00e78a9ddcd5a0e49ab3d12a9619 SHA512 7176e93a263975d31a6757acf01ac5be10eb34b19a2c3a5d5e92b087a574e76db16861923162ad73833379dc5132868d0b91e1f2ed692e2bdff5667938a76db6 WHIRLPOOL 9b282ffdaf9fd834d449e33176fb9e5a231e6a7f2a1a12b0da4825a96f820b3f87a73c9e4751c19bbf80c9b8ab2f30c1730003b010bd6153b83bb9009334986d
diff --git a/dev-ml/ocaml-dns/metadata.xml b/dev-ml/ocaml-dns/metadata.xml
new file mode 100644
index 000000000000..d639c50aaf16
--- /dev/null
+++ b/dev-ml/ocaml-dns/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <herd>ml</herd>
+    <herd>proxy-maintainers</herd>
+    <maintainer>
+        <email>tomboy64@sina.cn</email>
+    </maintainer>
+    <use>
+        <flag name="async">support for asynchronous execution</flag>
+        <flag name="lwt">enable threads via lwt</flag>
+    </use>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-dns/ocaml-dns-0.15.3.ebuild b/dev-ml/ocaml-dns/ocaml-dns-0.15.3.ebuild
new file mode 100644
index 000000000000..bf1a7813ec71
--- /dev/null
+++ b/dev-ml/ocaml-dns/ocaml-dns-0.15.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="A pure OCaml implementation of the DNS protocol"
+HOMEPAGE="https://github.com/mirage/ocaml-dns https://mirage.io"
+SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2 LGPL-2.1-with-linking-exception ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="async +lwt"
+
+RDEPEND="
+	async? ( >=dev-ml/async-112.24.00:= )
+	lwt? ( >=dev-ml/lwt-2.4.7:=
+		dev-ml/ocaml-cstruct:=[lwt(-)] )
+	>=dev-lang/ocaml-4:=
+	dev-ml/cmdliner:=
+	dev-ml/mirage-profile:=
+	>=dev-ml/ocaml-base64-2.0.0:=
+	>=dev-ml/ocaml-cstruct-1.0.1:=
+	>=dev-ml/ocaml-ipaddr-2.6.0:=
+	dev-ml/ocaml-re:=
+	>=dev-ml/ocaml-uri-1.7.0:=
+	!<dev-ml/mirage-types-1.2.0
+	!dev-ml/odns
+"
+DEPEND="
+	test? ( dev-ml/ounit
+		dev-ml/ocaml-pcap )
+	${RDEPEND}
+"
+
+src_configure() {
+	oasis_configure_opts="
+		$(use_enable async)
+		$(use_enable lwt)
+		$(use_enable test nettests)
+	" oasis_src_configure
+}
+
+DOCS=( CHANGES README.md TODO.md )
diff --git a/dev-python/cffi/cffi-1.2.1.ebuild b/dev-python/cffi/cffi-1.2.1.ebuild
index 9eeec09686ba..f4d193c666b4 100644
--- a/dev-python/cffi/cffi-1.2.1.ebuild
+++ b/dev-python/cffi/cffi-1.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/cryptography/cryptography-1.0.2.ebuild b/dev-python/cryptography/cryptography-1.0.2.ebuild
index ee94db7ff6ca..261acaf0bfda 100644
--- a/dev-python/cryptography/cryptography-1.0.2.ebuild
+++ b/dev-python/cryptography/cryptography-1.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="libressl test"
 
 RDEPEND="
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
index 4de57117303c..bc3755153129 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]"
diff --git a/dev-python/ply/ply-3.6-r1.ebuild b/dev-python/ply/ply-3.6-r1.ebuild
index bdaf35be2e29..b06f958f73d6 100644
--- a/dev-python/ply/ply-3.6-r1.ebuild
+++ b/dev-python/ply/ply-3.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.dabeaz.com/ply/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ply/ply-3.8.ebuild b/dev-python/ply/ply-3.8.ebuild
index 0bf8120129e2..5714a6c1cc90 100644
--- a/dev-python/ply/ply-3.8.ebuild
+++ b/dev-python/ply/ply-3.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="examples"
 
 RDEPEND=""
diff --git a/dev-python/pycparser/pycparser-2.14.ebuild b/dev-python/pycparser/pycparser-2.14.ebuild
index c7fc55640f53..a988a05d68ac 100644
--- a/dev-python/pycparser/pycparser-2.14.ebuild
+++ b/dev-python/pycparser/pycparser-2.14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyopenssl/pyopenssl-0.15.1.ebuild b/dev-python/pyopenssl/pyopenssl-0.15.1.ebuild
index 81fcfde2507a..6fb281dddf01 100644
--- a/dev-python/pyopenssl/pyopenssl-0.15.1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-0.15.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/requests/requests-2.8.0.ebuild b/dev-python/requests/requests-2.8.0.ebuild
index bd0dde379112..85fa541b884d 100644
--- a/dev-python/requests/requests-2.8.0.ebuild
+++ b/dev-python/requests/requests-2.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 # bundles dev-python/urllib3 snapshot
diff --git a/dev-python/requests/requests-2.8.1.ebuild b/dev-python/requests/requests-2.8.1.ebuild
index bd0dde379112..85fa541b884d 100644
--- a/dev-python/requests/requests-2.8.1.ebuild
+++ b/dev-python/requests/requests-2.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 # bundles dev-python/urllib3 snapshot
diff --git a/dev-util/android-studio/android-studio-1.4.0.10.141.2288178-r1.ebuild b/dev-util/android-studio/android-studio-1.4.0.10.141.2288178-r1.ebuild
index 2cff0d732133..721d7ba3934a 100644
--- a/dev-util/android-studio/android-studio-1.4.0.10.141.2288178-r1.ebuild
+++ b/dev-util/android-studio/android-studio-1.4.0.10.141.2288178-r1.ebuild
@@ -34,7 +34,7 @@ RDEPEND=">=virtual/jdk-1.7
 	>=media-libs/freetype-2.5.5[abi_x86_32(-)]
 	>=media-libs/libpng-1.2.51[abi_x86_32(-)]
 	>=media-libs/mesa-10.2.8[abi_x86_32(-)]
-	|| ( >=sys-libs/ncurses-5.9-r3:0/5[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3:5/5[abi_x86_32(-)] )
+	|| ( >=sys-libs/ncurses-5.9-r3:5/5[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3:0/5[abi_x86_32(-)] )
 	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
 	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
 	>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
diff --git a/dev-util/cmake/cmake-3.3.1-r1.ebuild b/dev-util/cmake/cmake-3.3.1-r1.ebuild
index 0ce39409b076..460a977829e3 100644
--- a/dev-util/cmake/cmake-3.3.1-r1.ebuild
+++ b/dev-util/cmake/cmake-3.3.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.
 
 LICENSE="CMake"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
 
 RDEPEND="
diff --git a/dev-util/cmake/cmake-3.3.2-r1.ebuild b/dev-util/cmake/cmake-3.3.2-r1.ebuild
index 417385cc22d0..36d52f957323 100644
--- a/dev-util/cmake/cmake-3.3.2-r1.ebuild
+++ b/dev-util/cmake/cmake-3.3.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.
 
 LICENSE="CMake"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
 
 RDEPEND="
diff --git a/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild b/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
index 534ffabb0e2b..7967fb01f6ed 100644
--- a/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
@@ -17,7 +17,7 @@ https://github.com/petervanderdoes/${COMP_PN}/archive/${COMP_PV}.tar.gz -> ${COM
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-vcs/git/git-2.3.10.ebuild b/dev-vcs/git/git-2.3.10.ebuild
index 22f19719d168..44728de9706f 100644
--- a/dev-vcs/git/git-2.3.10.ebuild
+++ b/dev-vcs/git/git-2.3.10.ebuild
@@ -33,7 +33,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.4.10.ebuild b/dev-vcs/git/git-2.4.10.ebuild
index e288e6f5123e..2911a9b5f17f 100644
--- a/dev-vcs/git/git-2.4.10.ebuild
+++ b/dev-vcs/git/git-2.4.10.ebuild
@@ -33,7 +33,7 @@ if [[ ${PV} != *9999 ]]; then
 			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			)"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/games-strategy/openra/openra-20120630.ebuild b/games-strategy/openra/openra-20120630-r1.ebuild
similarity index 99%
rename from games-strategy/openra/openra-20120630.ebuild
rename to games-strategy/openra/openra-20120630-r1.ebuild
index 99175b960e6d..9ca4e47a65f2 100644
--- a/games-strategy/openra/openra-20120630.ebuild
+++ b/games-strategy/openra/openra-20120630-r1.ebuild
@@ -20,7 +20,7 @@ DEPEND="dev-dotnet/libgdiplus
 	media-libs/freetype:2[X]
 	media-libs/libsdl[X,opengl,video]
 	media-libs/openal
-	virtual/jpeg
+	virtual/jpeg:0
 	virtual/opengl
 	cg? ( >=media-gfx/nvidia-cg-toolkit-2.1.0017 )"
 RDEPEND="${DEPEND}"
diff --git a/games-strategy/openra/openra-20130514-r1.ebuild b/games-strategy/openra/openra-20130514-r2.ebuild
similarity index 99%
rename from games-strategy/openra/openra-20130514-r1.ebuild
rename to games-strategy/openra/openra-20130514-r2.ebuild
index 198236e3262c..b09e3979e3b9 100644
--- a/games-strategy/openra/openra-20130514-r1.ebuild
+++ b/games-strategy/openra/openra-20130514-r2.ebuild
@@ -20,7 +20,7 @@ DEPEND="dev-dotnet/libgdiplus
 	media-libs/freetype:2[X]
 	media-libs/libsdl[X,opengl,video]
 	media-libs/openal
-	virtual/jpeg
+	virtual/jpeg:0
 	virtual/opengl
 	cg? ( >=media-gfx/nvidia-cg-toolkit-2.1.0017 )"
 RDEPEND="${DEPEND}"
diff --git a/games-strategy/openra/openra-20131223-r1.ebuild b/games-strategy/openra/openra-20131223-r2.ebuild
similarity index 99%
rename from games-strategy/openra/openra-20131223-r1.ebuild
rename to games-strategy/openra/openra-20131223-r2.ebuild
index a6d7ef30111a..515437beb1f4 100644
--- a/games-strategy/openra/openra-20131223-r1.ebuild
+++ b/games-strategy/openra/openra-20131223-r2.ebuild
@@ -23,7 +23,7 @@ DEPEND="dev-dotnet/libgdiplus
 		media-libs/libsdl2[X,opengl,video]
 	)
 	media-libs/openal
-	virtual/jpeg
+	virtual/jpeg:0
 	virtual/opengl"
 RDEPEND="${DEPEND}"
 
diff --git a/games-strategy/openra/openra-20140608.ebuild b/games-strategy/openra/openra-20140608-r1.ebuild
similarity index 99%
rename from games-strategy/openra/openra-20140608.ebuild
rename to games-strategy/openra/openra-20140608-r1.ebuild
index dec5437088ba..a40add83cf87 100644
--- a/games-strategy/openra/openra-20140608.ebuild
+++ b/games-strategy/openra/openra-20140608-r1.ebuild
@@ -22,7 +22,7 @@ DEPEND="dev-dotnet/libgdiplus
 	media-libs/freetype:2[X]
 	media-libs/libsdl2[X,opengl,video]
 	media-libs/openal
-	virtual/jpeg
+	virtual/jpeg:0
 	virtual/opengl"
 RDEPEND="${DEPEND}"
 
diff --git a/games-strategy/openra/openra-20140722.ebuild b/games-strategy/openra/openra-20140722-r1.ebuild
similarity index 99%
rename from games-strategy/openra/openra-20140722.ebuild
rename to games-strategy/openra/openra-20140722-r1.ebuild
index deca771a8c0f..2b71893316cd 100644
--- a/games-strategy/openra/openra-20140722.ebuild
+++ b/games-strategy/openra/openra-20140722-r1.ebuild
@@ -22,7 +22,7 @@ DEPEND="dev-dotnet/libgdiplus
 	media-libs/freetype:2[X]
 	media-libs/libsdl2[X,opengl,video]
 	media-libs/openal
-	virtual/jpeg
+	virtual/jpeg:0
 	virtual/opengl"
 RDEPEND="${DEPEND}"
 
diff --git a/games-strategy/openra/openra-20141029-r1.ebuild b/games-strategy/openra/openra-20141029-r2.ebuild
similarity index 99%
rename from games-strategy/openra/openra-20141029-r1.ebuild
rename to games-strategy/openra/openra-20141029-r2.ebuild
index 5cec47ca7acd..86bec9628ed2 100644
--- a/games-strategy/openra/openra-20141029-r1.ebuild
+++ b/games-strategy/openra/openra-20141029-r2.ebuild
@@ -22,7 +22,7 @@ DEPEND="dev-dotnet/libgdiplus
 	media-libs/freetype:2[X]
 	media-libs/libsdl2[X,opengl,video]
 	media-libs/openal
-	virtual/jpeg
+	virtual/jpeg:0
 	virtual/opengl"
 RDEPEND="${DEPEND}"
 
diff --git a/kde-base/kactivitymanagerd/kactivitymanagerd-4.13.3.ebuild b/kde-base/kactivitymanagerd/kactivitymanagerd-4.13.3-r1.ebuild
similarity index 89%
rename from kde-base/kactivitymanagerd/kactivitymanagerd-4.13.3.ebuild
rename to kde-base/kactivitymanagerd/kactivitymanagerd-4.13.3-r1.ebuild
index 61cd0d6d22a8..e5090026f250 100644
--- a/kde-base/kactivitymanagerd/kactivitymanagerd-4.13.3.ebuild
+++ b/kde-base/kactivitymanagerd/kactivitymanagerd-4.13.3-r1.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
-	!<kde-base/kactivitymanager-4.14.3-r1
+	!<kde-base/kactivities-4.13.3-r1
 	!kde-frameworks/kactivities
 "
 
@@ -20,6 +20,7 @@ S=${WORKDIR}/${KMNAME}-${PV}
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
 		-DWITH_NepomukCore=OFF
 	)
 	kde4-base_src_configure
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 17dcc96a06d2..cf0331cd99bd 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,3 +1,2 @@
-DIST kdelibs-4.14.12.tar.xz 11633140 SHA256 2f17d34af6bc7383625df5562239418c808afd7df462073331bd82a84b1f97e8 SHA512 f04b69bffa67ab76457e56c784604e59270bab081694aa5d19d7b19cc190b9c49c25de2ac8f05c49b2dd09b6c47efc091976d2845c4f3eedecda15feffedb20d WHIRLPOOL 7b9474387bad9e1929cbde352c4b30368dca50d7d7d4862b47fb8b1452528655f3fa4461843dcc26c5b704f3a0d87f2637e4a167c1ae75a4d67833f36bc02115
 DIST kdelibs-4.14.13.tar.xz 11633656 SHA256 61131ac45cfe34dc5e76cfe5ebcb13c7d2ed8b64c371272cb2d11787e1b240ad SHA512 8987f68310b6e97b9658c91a68a4b3195976a20250edeca9c0f58404e7a121b3cd8d1b56175f00c406ca210eef0cca99af349288e317caaad6d0be8afbf10ae9 WHIRLPOOL bf3a89f6e3e148723a83e682bc7fa5a94717624d9fc2d62b71679c9fe6f967ad051e1678018cd6ab047a81da9a0cf2472db15c9cc74dbc44f985600880e3e56a
 DIST kdelibs-4.14.8.tar.xz 11648060 SHA256 705fa8a9b3b3c962aa99d040eb32e68863ba4c2f567b82b9513379defbc39bbb SHA512 0cd5e8dd5cec7cf84bc66c6732f4967610211e521898da41601d24174f909043bafacbb9bd9775666cebb132747e2861c6c8ff07de61be708975f44dbbfb856e WHIRLPOOL 6405ee6b273899a26c39fa005c18be7270888113f93302990003b92ca96c52303ce853c5378c812f4ddf53f40c7b6ff9e2a958bc86a676d1e3abbfe4f3d96bd4
diff --git a/kde-base/kdelibs/kdelibs-4.14.12.ebuild b/kde-base/kdelibs/kdelibs-4.14.12.ebuild
deleted file mode 100644
index 959b7cc164d5..000000000000
--- a/kde-base/kdelibs/kdelibs-4.14.12.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_MIN_VERSION="3.3.1-r1"
-CPPUNIT_REQUIRED="optional"
-DECLARATIVE_REQUIRED="always"
-OPENGL_REQUIRED="optional"
-KDE_HANDBOOK="optional"
-inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
-
-EGIT_BRANCH="KDE/4.14"
-
-DESCRIPTION="KDE libraries needed by all KDE programs"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="cpu_flags_x86_3dnow acl alsa altivec +bzip2 +crypt debug doc fam jpeg2k
-kerberos lzma cpu_flags_x86_mmx nls openexr +policykit spell cpu_flags_x86_sse
-cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
-
-REQUIRED_USE="
-	udisks? ( udev )
-	upower? ( udev )
-"
-
-# needs the kate regression testsuite from svn
-RESTRICT="test"
-
-COMMONDEPEND="
-	>=app-misc/strigi-0.7.7
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	>=dev-libs/libattica-0.4.2
-	>=dev-libs/libdbusmenu-qt-0.3.2[qt4(+)]
-	dev-libs/libpcre[unicode]
-	dev-libs/libxml2
-	dev-libs/libxslt
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/giflib
-	media-libs/libpng:0=
-	media-libs/phonon[qt4]
-	sys-libs/zlib
-	virtual/jpeg:0
-	>=x11-misc/shared-mime-info-0.60
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	!aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXcursor
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXrender
-		x11-libs/libXScrnSaver
-		x11-libs/libXtst
-		!kernel_SunOS? (
-			|| (
-				sys-libs/libutempter
-				>=sys-freebsd/freebsd-lib-9.0
-			)
-		)
-	)
-	bzip2? ( app-arch/bzip2 )
-	crypt? ( app-crypt/qca:2[qt4(+)] )
-	fam? ( virtual/fam )
-	jpeg2k? ( media-libs/jasper )
-	kerberos? ( virtual/krb5 )
-	openexr? (
-		media-libs/openexr:=
-		media-libs/ilmbase:=
-	)
-	policykit? ( >=sys-auth/polkit-qt-0.103.0[qt4(+)] )
-	spell? ( app-text/enchant )
-	ssl? ( dev-libs/openssl:0 )
-	udev? ( virtual/udev )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${COMMONDEPEND}
-	doc? ( app-doc/doxygen )
-	nls? ( virtual/libintl )
-"
-RDEPEND="${COMMONDEPEND}
-	!dev-qt/qtphonon
-	!<=kde-base/plasma-workspace-4.7.1:4
-	!<=kde-base/kcontrol-4.4.50:4
-	>=app-crypt/gnupg-2.0.11
-	app-misc/ca-certificates
-	$(add_kdebase_dep kde-env '' 4.14.3)
-	sys-apps/dbus[X]
-	!aqua? (
-		udisks? ( sys-fs/udisks:2 )
-		x11-apps/iceauth
-		x11-apps/rgb
-		>=x11-misc/xdg-utils-1.0.2-r3
-		upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
-	)
-	udev? ( app-misc/media-player-info )
-"
-PDEPEND="
-	$(add_kdebase_dep katepart '' 4.14.3)
-	|| (
-		$(add_kdeapps_dep kfmclient '' 4.14.3)
-		x11-misc/xdg-utils
-	)
-	handbook? (
-		|| (
-			$(add_kdebase_dep khelpcenter '' 4.14.3)
-			kde-plasma/khelpcenter:5[compat(+)]
-		)
-	)
-	policykit? ( || (
-		>=sys-auth/polkit-kde-agent-0.99
-		kde-plasma/polkit-kde-agent
-	) )
-"
-
-PATCHES=(
-	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
-	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
-	"${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch"
-	"${FILESDIR}/${PN}-4.14.5-mimetypes.patch"
-	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
-	"${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
-	"${FILESDIR}/${PN}-4.8.1-norpath.patch"
-	"${FILESDIR}/${PN}-4.9.3-werror.patch"
-	"${FILESDIR}/${PN}-4.10.0-udisks.patch"
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ $(gcc-major-version) -lt 4 ]] || \
-				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
-			&& die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
-	fi
-}
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
-	sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
-		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
-
-	if use aqua; then
-		sed -i -e \
-			"s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
-			cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
-
-		#if [[ ${CHOST} == *-darwin8 ]]; then
-		sed -i -e \
-			"s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
-			cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
-		#fi
-
-		# solid/solid/backends/iokit doesn't properly link, so disable it.
-		sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
-			|| die "disabling solid/solid/backends/iokit failed"
-		sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
-			|| die "disabling solid/solid/backends/iokit failed"
-
-		# There's no fdatasync on OSX and the check fails to detect that.
-		sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
-			|| die "disabling fdatasync failed"
-
-		# Fix nameser include to nameser8_compat
-		sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
-			|| die "fixing nameser include failed"
-		append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
-
-		# Try to fix kkeyserver_mac
-		epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_HSPELL=OFF
-		-DWITH_ASPELL=OFF
-		-DWITH_DNSSD=OFF
-		-DKDE_DEFAULT_HOME=.kde4
-		-DKAUTH_BACKEND=POLKITQT-1
-		-DBUILD_libkactivities=OFF
-		-DWITH_Soprano=OFF
-		-DWITH_SharedDesktopOntologies=OFF
-		$(cmake-utils_use_build handbook doc)
-		$(cmake-utils_use_has cpu_flags_x86_3dnow X86_3DNOW)
-		$(cmake-utils_use_has altivec PPC_ALTIVEC)
-		$(cmake-utils_use_has cpu_flags_x86_mmx X86_MMX)
-		$(cmake-utils_use_has cpu_flags_x86_sse X86_SSE)
-		$(cmake-utils_use_has cpu_flags_x86_sse2 X86_SSE2)
-		$(cmake-utils_use_with acl)
-		$(cmake-utils_use_with alsa)
-		$(cmake-utils_use_with bzip2 BZip2)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with fam)
-		$(cmake-utils_use_with jpeg2k Jasper)
-		$(cmake-utils_use_with kerberos GSSAPI)
-		$(cmake-utils_use_with lzma LibLZMA)
-		$(cmake-utils_use_with nls Libintl)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with policykit PolkitQt-1)
-		$(cmake-utils_use_with spell ENCHANT)
-		$(cmake-utils_use_with ssl OpenSSL)
-		$(cmake-utils_use_with udev UDev)
-		$(cmake-utils_use_with udisks SOLID_UDISKS2)
-		$(cmake-utils_use_with zeroconf Avahi)
-	)
-	kde4-base_src_configure
-}
-
-src_compile() {
-	kde4-base_src_compile
-
-	# The building of apidox is not managed anymore by the build system
-	if use doc; then
-		einfo "Building API documentation"
-		cd "${S}"/doc/api/
-		./doxygen.sh "${S}" || die "APIDOX generation failed"
-	fi
-}
-
-src_install() {
-	kde4-base_src_install
-
-	# use system certificates
-	rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
-	dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
-
-	if use doc; then
-		einfo "Installing API documentation. This could take a bit of time."
-		cd "${S}"/doc/api/
-		docinto /HTML/en/kdelibs-apidox
-		dohtml -r ${P}-apidocs/*
-	fi
-
-	if use aqua; then
-		einfo "fixing ${PN} plugins"
-
-		local _PV=${PV:0:3}.0
-		local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
-
-		install_name_tool -id \
-			"${_dir}/libkrossqtsplugin.${_PV}.dylib" \
-			"${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
-			|| die "failed fixing libkrossqtsplugin.${_PV}.dylib"
-
-		einfo "fixing ${PN} cmake detection files"
-		#sed -i -e \
-		#	"s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
-		echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
-			"${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
-			|| die "failed fixing FindXKB.cmake"
-	fi
-
-	einfo Installing environment file.
-	# Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
-	echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
-	echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
-	doenvd "${T}/77kde"
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-
-	if use zeroconf; then
-		echo
-		elog "To make zeroconf support available in KDE make sure that the avahi daemon"
-		elog "is running."
-		echo
-		einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
-		einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
-		einfo "to include 'mdns', e.g.:"
-		einfo "	hosts: files mdns dns"
-		echo
-	fi
-
-	kde4-base_pkg_postinst
-}
-
-pkg_prerm() {
-	# Remove ksycoca4 global database
-	rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-
-	kde4-base_pkg_postrm
-}
diff --git a/media-libs/libass/libass-0.12.3.ebuild b/media-libs/libass/libass-0.12.3.ebuild
index 3cbdc332b5ab..ca10d48b8a8b 100644
--- a/media-libs/libass/libass-0.12.3.ebuild
+++ b/media-libs/libass/libass-0.12.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0/5" # subslot = libass soname version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+enca +fontconfig +harfbuzz static-libs"
 
 RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
diff --git a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
index b1f57cbbb5ad..c7dd365b6e10 100644
--- a/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
+++ b/media-libs/smpeg/smpeg-0.4.4-r10.ebuild
@@ -52,6 +52,7 @@ src_prepare() {
 	rm "${S}/acinclude.m4"
 
 	cd "${S}"
+	mv configure.in configure.ac || die
 	AT_M4DIR="${S}/m4" eautoreconf
 }
 
diff --git a/media-sound/gejengel/files/0.1.4-flac_ln.patch b/media-sound/gejengel/files/0.1.4-flac_ln.patch
new file mode 100644
index 000000000000..2d4473e227a9
--- /dev/null
+++ b/media-sound/gejengel/files/0.1.4-flac_ln.patch
@@ -0,0 +1,42 @@
+Fixes Bug #542708
+The code uses functionality provided by libFLAC and libFLAC++ but only linked against libFLAC++.
+Included also is a check for libFLAC availability and added linking against libFLAC
+--- a/gejengel-0.1.4/configure.ac
++++ b/gejengel-0.1.4/configure.ac
+@@ -129,14 +129,20 @@ AC_ARG_ENABLE(flac,
+     [ enable_flac=$enableval ] )
+ 
+ if test "$enable_flac" != "no"; then
+-    PKG_CHECK_MODULES(FLAC, flac++, HAVE_FLAC=yes, HAVE_FLAC=no)
++    PKG_CHECK_MODULES(FLAC, flac, HAVE_FLAC=yes, HAVE_FLAC=no)
+     if test $HAVE_FLAC = yes; then
+-        AC_DEFINE(HAVE_FLAC, [1], Flac support enabled)
+-        AC_SUBST(FLAC_CFLAGS)
+-        AC_SUBST(FLAC_LIBS)
++	AC_DEFINE(HAVE_FLAC, [1], Flac found)
++	AC_SUBST(FLAC_CFLAGS)
++	AC_SUBST(FLAC_LIBS)
++        PKG_CHECK_MODULES(FLACPP, flac++, HAVE_FLACPP=yes, HAVE_FLACPP=no)
++        if test $HAVE_FLACPP = yes; then
++            AC_DEFINE(HAVE_FLACPP, [1], Flac support enabled)
++            AC_SUBST(FLACPP_CFLAGS)
++            AC_SUBST(FLACPP_LIBS)
++        fi
+     fi
+ fi
+-AM_CONDITIONAL(FLAC, test "$HAVE_FLAC" = "yes")
++AM_CONDITIONAL(FLAC, test "$HAVE_FLACPP" = "yes")
+ 
+ ########################################################################
+ # Mad
+--- a/gejengel-0.1.4/Makefile.am
++++ b/gejengel-0.1.4/Makefile.am
+@@ -256,7 +256,7 @@ libgejengel_la_LIBADD = libutils.la \
+                         libmusiclibrary.la \
+                         libcore.la \
+                         libplugins.la -lpthread \
+-                        $(FFMPEG_LIBS) $(ALSA_LIBS) $(OPENAL_LIBS) $(GLIBMM_LIBS) $(SQLITE3_LIBS) $(TAGLIB_LIBS) $(LASTFM_LIBS) $(LIBNOTIFY_LIBS) $(PULSE_LIBS) $(IMAGEMAGICK_LIBS) $(GSTREAMER_LIBS) $(FLAC_LIBS) $(MAD_LIBS) $(DBUS_LIBS) $(XDGBASEDIR_LIBS)
++                        $(FFMPEG_LIBS) $(ALSA_LIBS) $(OPENAL_LIBS) $(GLIBMM_LIBS) $(SQLITE3_LIBS) $(TAGLIB_LIBS) $(LASTFM_LIBS) $(LIBNOTIFY_LIBS) $(PULSE_LIBS) $(IMAGEMAGICK_LIBS) $(GSTREAMER_LIBS) $(FLACPP_LIBS) $(FLAC_LIBS) $(MAD_LIBS) $(DBUS_LIBS) $(XDGBASEDIR_LIBS)
+ 
+ bin_PROGRAMS = gejengel
+ 
diff --git a/media-sound/gejengel/gejengel-0.1.4-r2.ebuild b/media-sound/gejengel/gejengel-0.1.4-r2.ebuild
new file mode 100644
index 000000000000..c49ab01b64d6
--- /dev/null
+++ b/media-sound/gejengel/gejengel-0.1.4-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils multilib flag-o-matic
+
+DESCRIPTION="Lightweight audio player"
+HOMEPAGE="https://github.com/dirkvdb/gejengel"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa audioscrobbler debug dbus +ffmpeg flac libnotify mad openal pulseaudio syslog"
+
+RDEPEND="dev-cpp/gtkmm:2.4
+	dev-cpp/pangomm:1.4
+	media-libs/taglib
+	dev-db/sqlite:3
+	|| ( media-gfx/imagemagick[cxx]
+	media-gfx/graphicsmagick[imagemagick] )
+	mad? ( media-libs/libmad )
+	flac? ( media-libs/flac[cxx] )
+	ffmpeg? ( >=virtual/ffmpeg-9 )
+	audioscrobbler? ( >=media-libs/lastfmlib-0.4 )
+	dbus? ( dev-libs/dbus-glib )
+	libnotify? ( x11-libs/libnotify )
+	openal? ( media-libs/openal )
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}
+	dev-libs/libxdg-basedir
+	dev-util/intltool
+	>=sys-devel/automake-1.11"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch \
+		"${FILESDIR}"/${P}-ffmpeg.patch \
+		"${FILESDIR}"/${P}-ffmpeg-1.patch \
+		"${FILESDIR}"/${P}-libav9.patch \
+		"${FILESDIR}"/${P}-ffmpeg2.patch \
+		"${FILESDIR}"/${PV}-flac_ln.patch
+
+	# Remove Vesion and Encoding from the desktop file
+	sed -i -e "/Version/d" -e "/Encoding/d" \
+		data/${PN}.desktop.in || die "sed failed"
+	append-cxxflags "-D__STDC_CONSTANT_MACROS"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-shared \
+		$(use_enable syslog logging) \
+		$(use_enable debug) \
+		$(use_enable openal) \
+		$(use_enable audioscrobbler lastfm) \
+		$(use_enable dbus) \
+		$(use_enable libnotify) \
+		$(use_enable mad) \
+		$(use_enable flac) \
+		$(use_enable ffmpeg) \
+		$(use_enable alsa) \
+		$(use_enable pulseaudio) \
+		--disable-unittests
+}
+
+src_compile() {
+	emake CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	default
+	# The libgejengel.a is used by the package when building but shouldn't end
+	# up in the installation target
+	rm -f "${ED}"usr/$(get_libdir)/libgejengel.{a,la}
+}
diff --git a/media-sound/gejengel/metadata.xml b/media-sound/gejengel/metadata.xml
index b6d93507fdf1..850d42a5998e 100644
--- a/media-sound/gejengel/metadata.xml
+++ b/media-sound/gejengel/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+	<herd>proxy-maintainers</herd>
+        <maintainer>
+                <email>DuPol@gmx.de</email>
+                <name>Dustin Polke</name>
+                <description>Proxy maintainer, to be assigned bugs</description>
 	</maintainer>
 	<use>
 		<flag name="audioscrobbler">Enable track submission on last.fm</flag>
diff --git a/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch b/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch
index 40ee0066e3d3..5c11e7682b59 100644
--- a/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch
+++ b/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch
@@ -1,6 +1,8 @@
+diff --git a/configure.ac b/configure.ac
+index 2d79f35..b82dd49 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -17,11 +17,8 @@
+@@ -17,11 +17,8 @@ AC_CONFIG_MACRO_DIR([m4])
  dnl Check for programs
  AC_PROG_CC_C99
  AC_PROG_INSTALL
@@ -13,19 +15,19 @@
  
  dnl =======================================================
  dnl initialize variables
-@@ -83,6 +80,19 @@
+@@ -83,6 +80,19 @@ mingw32* | windows*)
  esac
  AM_CONDITIONAL([HAVE_WINDOWS], [test $HAVE_WINDOWS -eq 1])
  
-+dnl ncurses
++dnl ncursesw
 +
-+PKG_CHECK_MODULES([ncurses], [ncurses],[
-+	LIBS="$LIBS $ncurses_LIBS"
++PKG_CHECK_MODULES([ncursesw], [ncursesw],[
++	LIBS="$LIBS $ncursesw_LIBS"
 +	ax_cv_curses_color=yes
 +	ax_cv_curses_mouse=yes
 +	ax_cv_curses_enhanced=yes
 +	AC_DEFINE([HAVE_NCURSES_H], [1], [Define to 1 if the Ncurses library is present])
-+	AC_SUBST([CURSES_LIB],[$ncurses_LIBS])
++	AC_SUBST([CURSES_LIB],[$ncursesw_LIBS])
 +	],
 +	[AC_MSG_ERROR([No curses support detected.])])
 +
@@ -33,7 +35,7 @@
  dnl multi-byte character support
  
  AC_ARG_ENABLE([multibyte],
-@@ -207,12 +217,6 @@
+@@ -207,12 +217,6 @@ AM_CONDITIONAL(ENABLE_HELP_SCREEN, test x$enable_help_screen = xyes)
  
  dnl Optional - curses getmouse support
  
diff --git a/media-sound/ncmpc/ncmpc-0.24-r1.ebuild b/media-sound/ncmpc/ncmpc-0.24-r2.ebuild
similarity index 86%
rename from media-sound/ncmpc/ncmpc-0.24-r1.ebuild
rename to media-sound/ncmpc/ncmpc-0.24-r2.ebuild
index 1e6e9f90e66f..533e1df3a801 100644
--- a/media-sound/ncmpc/ncmpc-0.24-r1.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.24-r2.ebuild
@@ -16,9 +16,8 @@ IUSE="artist-screen chat-screen colors debug +help-screen key-screen lirc lyrics
 
 RDEPEND=">=dev-libs/glib-2.12:2
 	>=media-libs/libmpdclient-2.3
-	sys-libs/ncurses
-	lirc? ( app-misc/lirc )
-	nls? ( sys-libs/ncurses[unicode] )"
+	sys-libs/ncurses[unicode]
+	lirc? ( app-misc/lirc )"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	virtual/pkgconfig"
@@ -26,7 +25,9 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS NEWS README doc/config.sample doc/keys.sample )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.24-tinfo.patch
+	# default ax_with_curses.m4 produces automagic dependency on ncursesw
+	# also, ncursesw is required for colors (bug #554245), so we force it here
+	epatch "${FILESDIR}"/${PN}-0.24-tinfo2.patch
 
 	cp "${FILESDIR}"/ax_require_defined.m4 m4/ || die
 
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild
index af688bd11ab5..7aa3e123d7d2 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ncmpcpp.rybczak.net/stable/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm hppa ~ppc ppc64 ~sparc x86"
 IUSE="clock curl outputs taglib unicode visualizer"
 
 RDEPEND="
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 47733834f5e7..94f188aa580f 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Oct 2015 13:11:16 +0000
+Sun, 18 Oct 2015 20:11:29 +0000
diff --git a/metadata/glsa/glsa-201510-01.xml b/metadata/glsa/glsa-201510-01.xml
new file mode 100644
index 000000000000..2f65e1fe51b7
--- /dev/null
+++ b/metadata/glsa/glsa-201510-01.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201510-01">
+  <title>BIND: Denial of Service</title>
+  <synopsis>A vulnerability in BIND could lead to a Denial of Service
+    condition.
+  </synopsis>
+  <product type="ebuild">bind</product>
+  <announced>October 18, 2015</announced>
+  <revised>October 18, 2015: 1</revised>
+  <bug>540640</bug>
+  <bug>553584</bug>
+  <bug>556150</bug>
+  <bug>559462</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-dns/bind" auto="yes" arch="*">
+      <unaffected range="ge">9.10.2_p4</unaffected>
+      <vulnerable range="lt">9.10.2_p4</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>BIND (Berkeley Internet Name Domain) is a Name Server.</p>
+  </background>
+  <description>
+    <p>A vulnerability has been discovered in BIND’s named utility leading to
+      a Denial of Service condition.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker may be able to cause Denial of Service condition via
+      specially constructed zone data.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All BIND users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=net-dns/bind-9.10.2_p4"
+    </code>
+    
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-1349">CVE-2015-1349</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-4620">CVE-2015-4620</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-5477">CVE-2015-5477</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-5722">CVE-2015-5722</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-5986">CVE-2015-5986</uri>
+  </references>
+  <metadata tag="requester" timestamp="Thu, 23 Jul 2015 15:16:23 +0000">Zlogene</metadata>
+  <metadata tag="submitter" timestamp="Sun, 18 Oct 2015 19:47:34 +0000">Zlogene</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 47733834f5e7..381784b59a3f 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Oct 2015 13:11:16 +0000
+Sun, 18 Oct 2015 20:11:30 +0000
diff --git a/metadata/md5-cache/app-admin/ansible-1.9.3 b/metadata/md5-cache/app-admin/ansible-1.9.3
index b73858d55fe7..ef965b28a338 100644
--- a/metadata/md5-cache/app-admin/ansible-1.9.3
+++ b/metadata/md5-cache/app-admin/ansible-1.9.3
@@ -4,7 +4,7 @@ DESCRIPTION=Radically simple deployment, model-driven configuration management,
 EAPI=5
 HOMEPAGE=http://ansible.com/
 IUSE=test python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~x64-macos
+KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-python/httplib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/keyczar[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible/ansible-1.9.3.tar.gz
 _eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	43da5163ba106e87d22d2e7d6d67537f	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	9c405693f1f355a718700c5cffffd9e5	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=35eeed20256db4c6f2aaffb7a9b80e94
+_md5_=c3afbdf6a6626f4bd5eb9cdcdcab566d
diff --git a/metadata/md5-cache/app-admin/hardinfo-0.5.2_pre20130823 b/metadata/md5-cache/app-admin/hardinfo-0.5.2_pre20130823
index ac0c169f79db..1bb4e5ffd796 100644
--- a/metadata/md5-cache/app-admin/hardinfo-0.5.2_pre20130823
+++ b/metadata/md5-cache/app-admin/hardinfo-0.5.2_pre20130823
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-libs/glib:2 net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=A system information and benchmark tool for Linux systems
 EAPI=5
-HOMEPAGE=http://hardinfo.berlios.de/
+HOMEPAGE=http://hardinfo.org/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 net-libs/libsoup x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~hasufell/distfiles/hardinfo-0.5.2_pre20130823.tar.xz
 _eclasses_=cmake-utils	7dc05d514e5011a2a16bfa7a32e69587	eutils	43da5163ba106e87d22d2e7d6d67537f	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=6f3d4654a881088896ee488cd13cbac7
+_md5_=ff3ea62d30472077c43e120a45832f44
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.1.9 b/metadata/md5-cache/app-crypt/gnupg-2.1.9
index 5d43d4897ac8..cc611138a876 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.1.9
+++ b/metadata/md5-cache/app-crypt/gnupg-2.1.9
@@ -4,11 +4,11 @@ DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
 EAPI=5
 HOMEPAGE=http://www.gnupg.org/
 IUSE=bzip2 doc +gnutls ldap nls readline static selinux smartcard tools usb
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=!static? ( dev-libs/npth >=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.6.2[threads] >=dev-libs/libgpg-error-1.17 >=dev-libs/libksba-1.0.7 >=net-misc/curl-7.10 gnutls? ( >=net-libs/gnutls-3.0 ) sys-libs/zlib ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline:= ) smartcard? ( usb? ( virtual/libusb:0 ) ) ) app-crypt/pinentry !app-crypt/dirmngr selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
 REQUIRED_USE=smartcard? ( !static )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.1.9.tar.bz2
 _eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=26210f35070db9ba76f7e3cbe3025885
+_md5_=5666e74326793a7be6edeedf6a78db78
diff --git a/metadata/md5-cache/app-emulation/virt-viewer-2.0 b/metadata/md5-cache/app-emulation/virt-viewer-2.0
index a882ddef7a61..70bbe6e6c87d 100644
--- a/metadata/md5-cache/app-emulation/virt-viewer-2.0
+++ b/metadata/md5-cache/app-emulation/virt-viewer-2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Graphical console client for connecting to virtual machines
 EAPI=5
 HOMEPAGE=http://virt-manager.org/
 IUSE=sasl +spice +vnc debug
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-emulation/libvirt-0.10.0[sasl?] >=dev-libs/libxml2-2.6 x11-libs/gtk+:3 spice? ( >=net-misc/spice-gtk-0.22[sasl?,gtk3] ) vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3] )
 REQUIRED_USE=|| ( spice vnc )
 SLOT=0
 SRC_URI=http://virt-manager.org/download/sources/virt-viewer/virt-viewer-2.0.tar.gz
 _eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d798df6eab556188c19eaf6fea2bea18
+_md5_=6254ab486b532d25a7463c09c2b9dd76
diff --git a/metadata/md5-cache/app-misc/recoll-1.17.3-r1 b/metadata/md5-cache/app-misc/recoll-1.17.3-r1
index ce6a745751ee..a720c80b4d56 100644
--- a/metadata/md5-cache/app-misc/recoll-1.17.3-r1
+++ b/metadata/md5-cache/app-misc/recoll-1.17.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( fam inotify ) session? ( || ( fam inotify ) )
 SLOT=0
 SRC_URI=http://www.lesbonscomptes.com/recoll/recoll-1.17.3.tar.gz
 _eclasses_=base	84d9f879f57a8316ff02be0373a3d6f9	eutils	43da5163ba106e87d22d2e7d6d67537f	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	python	06d7be3e54573292f012e3cc433d8297	qmake-utils	05b63bb5c708c5903a9de5c58c8e43c8	qt4-r2	cb2cb5856695b300266b425da70e82d8	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ae073df855e4d960b0cb37d97797168c
+_md5_=299432c54e1def5c686486fb59cffa2f
diff --git a/metadata/md5-cache/app-misc/recoll-1.19.5 b/metadata/md5-cache/app-misc/recoll-1.19.5
index 9fbb22984bbd..bf3958bda38e 100644
--- a/metadata/md5-cache/app-misc/recoll-1.19.5
+++ b/metadata/md5-cache/app-misc/recoll-1.19.5
@@ -11,4 +11,4 @@ REQUIRED_USE=session? ( || ( fam inotify ) )
 SLOT=0
 SRC_URI=http://www.lesbonscomptes.com/recoll/recoll-1.19.5.tar.gz
 _eclasses_=base	84d9f879f57a8316ff02be0373a3d6f9	eutils	43da5163ba106e87d22d2e7d6d67537f	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	python	06d7be3e54573292f012e3cc433d8297	qmake-utils	05b63bb5c708c5903a9de5c58c8e43c8	qt4-r2	cb2cb5856695b300266b425da70e82d8	readme.gentoo	e37aea783a61ae55fab947df247eebea	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2083cb323e7c4a3395ccefb13c4511ed
+_md5_=67cccb7f44538caaba088db82a879c20
diff --git a/metadata/md5-cache/app-text/html-xml-utils-6.9 b/metadata/md5-cache/app-text/html-xml-utils-6.9
index 5f5e05cd7b0f..2bea43874ed4 100644
--- a/metadata/md5-cache/app-text/html-xml-utils-6.9
+++ b/metadata/md5-cache/app-text/html-xml-utils-6.9
@@ -3,9 +3,9 @@ DEPEND=net-misc/curl
 DESCRIPTION=A number of simple utilities for manipulating HTML and XML files
 EAPI=5
 HOMEPAGE=http://www.w3.org/Tools/HTML-XML-utils/
-KEYWORDS=amd64 ppc ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ppc ppc64 x86 ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=W3C
 RDEPEND=net-misc/curl
 SLOT=0
 SRC_URI=http://www.w3.org/Tools/HTML-XML-utils/html-xml-utils-6.9.tar.gz
-_md5_=a6ce80343de42fcce2b2930558e64628
+_md5_=bac4d513292d96b09a6d6aac0108d8d4
diff --git a/metadata/md5-cache/dev-java/colt-1.2.0-r2 b/metadata/md5-cache/dev-java/colt-1.2.0-r2
index 1b59533bc02e..dbf212a1eac2 100644
--- a/metadata/md5-cache/dev-java/colt-1.2.0-r2
+++ b/metadata/md5-cache/dev-java/colt-1.2.0-r2
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.4 >=dev-java/concurrent-util-1.3.4:0 >=dev-java/java-con
 SLOT=0
 SRC_URI=http://dsd.lbl.gov/~hoschek/colt-download/releases/colt-1.2.0.tar.gz
 _eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	java-ant-2	946f77f25d457a91a2188c26f3e50b3e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	c059b30d6a4df7cf32e2c98c1da1c9b5	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=684a06cf85b5934c5be9babb7ae1f5a9
+_md5_=48301fe9f947d38ad02a32834781f8b3
diff --git a/metadata/md5-cache/dev-java/colt-1.2.0-r3 b/metadata/md5-cache/dev-java/colt-1.2.0-r3
index e2a29eefe5f8..571cd2d90379 100644
--- a/metadata/md5-cache/dev-java/colt-1.2.0-r3
+++ b/metadata/md5-cache/dev-java/colt-1.2.0-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A set of Open Source Libraries for High Performance Scientific and T
 EAPI=5
 HOMEPAGE=http://www-itg.lbl.gov/~hoschek/colt/
 IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=colt
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://dsd.lbl.gov/~hoschek/colt-download/releases/colt-1.2.0.tar.gz
 _eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	java-ant-2	946f77f25d457a91a2188c26f3e50b3e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	c059b30d6a4df7cf32e2c98c1da1c9b5	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8e883bb17becac8fdc4bc1889c82ca28
+_md5_=7600f377cd6e5a868ec936b4ed23c3c6
diff --git a/metadata/md5-cache/dev-java/ehcache-1.1-r1 b/metadata/md5-cache/dev-java/ehcache-1.1-r1
deleted file mode 100644
index 93adccfd8459..000000000000
--- a/metadata/md5-cache/dev-java/ehcache-1.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install preinst setup unpack
-DEPEND=>=virtual/jdk-1.4 dev-java/commons-collections dev-java/concurrent-util dev-java/commons-logging >=dev-java/ant-core-1.5 >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Ehcache is a pure Java, fully-featured, in-process cache
-HOMEPAGE=http://ehcache.sourceforge.net
-IUSE=doc elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jre-1.4 dev-java/commons-collections dev-java/concurrent-util dev-java/commons-logging >=dev-java/java-config-2.2.0
-SLOT=0
-SRC_URI=mirror://sourceforge/ehcache/ehcache-1.1.tgz
-_eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	java-ant-2	946f77f25d457a91a2188c26f3e50b3e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	c059b30d6a4df7cf32e2c98c1da1c9b5	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=86c8f8d05bf5ba37ddd905be91f5a4d4
diff --git a/metadata/md5-cache/dev-java/ehcache-1.1-r2 b/metadata/md5-cache/dev-java/ehcache-1.1-r2
deleted file mode 100644
index 36e24c08accd..000000000000
--- a/metadata/md5-cache/dev-java/ehcache-1.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/zip dev-java/commons-collections:0 dev-java/concurrent-util:0 dev-java/commons-logging:0 >=dev-java/ant-core-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-DESCRIPTION=Ehcache is a pure Java, fully-featured, in-process cache
-EAPI=5
-HOMEPAGE=http://ehcache.sourceforge.net
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=Apache-1.1
-RDEPEND=>=virtual/jre-1.4 dev-java/commons-collections:0 dev-java/concurrent-util:0 dev-java/commons-logging:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/ehcache/ehcache-1.1.tgz
-_eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	b39bf980f65c12acb466f0a891fc002d	java-utils-2	c059b30d6a4df7cf32e2c98c1da1c9b5	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5e6cf45779504ac6d3dba0cd03f7f4b9
diff --git a/metadata/md5-cache/dev-java/fec-1.0.4-r2 b/metadata/md5-cache/dev-java/fec-1.0.4-r2
new file mode 100644
index 000000000000..8d7af93abc7a
--- /dev/null
+++ b/metadata/md5-cache/dev-java/fec-1.0.4-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 app-arch/unzip dev-java/log4j:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Forward Error Correction library in Java
+EAPI=5
+HOMEPAGE=https://bitbucket.org/onionnetworks/
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=virtual/jre-1.6 dev-java/log4j:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~monsieurp/packages/fec-1.0.4.tar.gz
+_eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	java-ant-2	946f77f25d457a91a2188c26f3e50b3e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	c059b30d6a4df7cf32e2c98c1da1c9b5	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=01cb5862abc48fec02079c5a807b407a
diff --git a/metadata/md5-cache/dev-java/log4j-1.2.17-r3 b/metadata/md5-cache/dev-java/log4j-1.2.17-r3
new file mode 100644
index 000000000000..066d267ddf53
--- /dev/null
+++ b/metadata/md5-cache/dev-java/log4j-1.2.17-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 javamail? ( dev-java/oracle-javamail:0 java-virtuals/jaf:0 ) jms? ( java-virtuals/jms:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=A low-overhead robust logging package for Java
+EAPI=5
+HOMEPAGE=http://logging.apache.org/log4j/
+IUSE=javamail jms elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.6 javamail? ( dev-java/oracle-javamail:0 java-virtuals/jaf:0 ) jms? ( java-virtuals/jms:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://apache/logging/log4j/1.2.17/log4j-1.2.17.tar.gz
+_eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	java-ant-2	946f77f25d457a91a2188c26f3e50b3e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	c059b30d6a4df7cf32e2c98c1da1c9b5	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=36aaa60f3c76abb59e457cb0021ec25d
diff --git a/metadata/md5-cache/dev-libs/npth-1.1 b/metadata/md5-cache/dev-libs/npth-1.1
index 6de9bd04328e..5121a23a476e 100644
--- a/metadata/md5-cache/dev-libs/npth-1.1
+++ b/metadata/md5-cache/dev-libs/npth-1.1
@@ -3,9 +3,9 @@ DESCRIPTION=New GNU Portable Threads Library
 EAPI=5
 HOMEPAGE=http://thread.gmane.org/gmane.comp.encryption.gpg.announce/179
 IUSE=static-libs
-KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnupg/npth/npth-1.1.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	0bf099a6e3dfeaf20a7a94504d8dd896	eutils	43da5163ba106e87d22d2e7d6d67537f	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=73a0be8abbbc373a3092c8710ba63f39
+_md5_=3a486a78d9064de9d355de2cfd9a13cf
diff --git a/metadata/md5-cache/dev-libs/npth-1.2 b/metadata/md5-cache/dev-libs/npth-1.2
index 5548bba1bcde..4d431787b5b9 100644
--- a/metadata/md5-cache/dev-libs/npth-1.2
+++ b/metadata/md5-cache/dev-libs/npth-1.2
@@ -3,9 +3,9 @@ DESCRIPTION=New GNU Portable Threads Library
 EAPI=5
 HOMEPAGE=http://thread.gmane.org/gmane.comp.encryption.gpg.announce/179
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnupg/npth/npth-1.2.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	0bf099a6e3dfeaf20a7a94504d8dd896	eutils	43da5163ba106e87d22d2e7d6d67537f	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=474db8ad38aa7d143c8880ec6911a61c
+_md5_=5c7ba8dbe67d9a349e214d6fd0083d1c
diff --git a/metadata/md5-cache/dev-lisp/asdf-3.1.6 b/metadata/md5-cache/dev-lisp/asdf-3.1.6
new file mode 100644
index 000000000000..16e5ebb82c4b
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/asdf-3.1.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=!dev-lisp/cl-asdf !dev-lisp/asdf-binary-locations !dev-lisp/gentoo-init !<dev-lisp/asdf-2.33-r3 doc? ( virtual/texi2dvi )
+DESCRIPTION=ASDF is Another System Definition Facility for Common Lisp
+EAPI=5
+HOMEPAGE=http://common-lisp.net/project/asdf/
+IUSE=doc
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=MIT
+PDEPEND=~dev-lisp/uiop-3.1.6
+SLOT=0/3.1.6
+SRC_URI=http://common-lisp.net/project/asdf/archives/asdf-3.1.6.tar.gz
+_eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=e4cde3daa67e59b9f1eaf78cec32d124
diff --git a/metadata/md5-cache/dev-lisp/uiop-3.1.6 b/metadata/md5-cache/dev-lisp/uiop-3.1.6
new file mode 100644
index 000000000000..51a5203a30bd
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/uiop-3.1.6
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=UIOP is a portability layer spun off ASDF3
+EAPI=5
+HOMEPAGE=http://common-lisp.net/project/asdf/
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=MIT
+RDEPEND=~dev-lisp/asdf-3.1.6
+SLOT=0
+SRC_URI=http://common-lisp.net/project/asdf/archives/asdf-3.1.6.tar.gz
+_eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=f10a0824e3b5bce8993eed6ba9657c24
diff --git a/metadata/md5-cache/dev-ml/ocaml-cstruct-1.7.0-r2 b/metadata/md5-cache/dev-ml/ocaml-cstruct-1.7.0-r3
similarity index 92%
rename from metadata/md5-cache/dev-ml/ocaml-cstruct-1.7.0-r2
rename to metadata/md5-cache/dev-ml/ocaml-cstruct-1.7.0-r3
index 795c212d013c..03eaf2bbadbb 100644
--- a/metadata/md5-cache/dev-ml/ocaml-cstruct-1.7.0-r2
+++ b/metadata/md5-cache/dev-ml/ocaml-cstruct-1.7.0-r3
@@ -3,11 +3,11 @@ DEPEND=test? ( dev-ml/ounit ) async? ( dev-ml/async:= ) camlp4? ( dev-ml/camlp4:
 DESCRIPTION=Map OCaml arrays onto C-like structs
 EAPI=5
 HOMEPAGE=https://github.com/mirage/ocaml-cstruct https://mirage.io
-IUSE=async +camlp4 lwt +ocamlopt debug doc test
+IUSE=async +camlp4 +lwt +ocamlopt debug doc test
 KEYWORDS=~amd64
 LICENSE=ISC
 RDEPEND=async? ( dev-ml/async:= ) camlp4? ( dev-ml/camlp4:= ) lwt? ( dev-ml/lwt:= ) >=dev-lang/ocaml-4.01:= dev-ml/ocplib-endian:= dev-ml/sexplib:= dev-ml/type-conv:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/1.7.0
 SRC_URI=https://github.com/mirage/ocaml-cstruct/archive/v1.7.0.tar.gz -> ocaml-cstruct-1.7.0.tar.gz
 _eclasses_=base	84d9f879f57a8316ff02be0373a3d6f9	eutils	43da5163ba106e87d22d2e7d6d67537f	findlib	9909e5ca0f77ff5b693885a3d7aeadb7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	oasis	1f8aac15a40bfb39dd98018626248fe1	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=884f5ba9b6a81b3e81c00cac3a2aebbd
+_md5_=4f22e3ee234e44814b44da1da7451949
diff --git a/metadata/md5-cache/dev-ml/ocaml-dns-0.15.3 b/metadata/md5-cache/dev-ml/ocaml-dns-0.15.3
new file mode 100644
index 000000000000..3dffc14f0025
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocaml-dns-0.15.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=test? ( dev-ml/ounit dev-ml/ocaml-pcap ) async? ( >=dev-ml/async-112.24.00:= ) lwt? ( >=dev-ml/lwt-2.4.7:= dev-ml/ocaml-cstruct:=[lwt(-)] ) >=dev-lang/ocaml-4:= dev-ml/cmdliner:= dev-ml/mirage-profile:= >=dev-ml/ocaml-base64-2.0.0:= >=dev-ml/ocaml-cstruct-1.0.1:= >=dev-ml/ocaml-ipaddr-2.6.0:= dev-ml/ocaml-re:= >=dev-ml/ocaml-uri-1.7.0:= !<dev-ml/mirage-types-1.2.0 !dev-ml/odns >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+DESCRIPTION=A pure OCaml implementation of the DNS protocol
+EAPI=5
+HOMEPAGE=https://github.com/mirage/ocaml-dns https://mirage.io
+IUSE=async +lwt +ocamlopt debug doc test
+KEYWORDS=~amd64
+LICENSE=LGPL-2 LGPL-2.1-with-linking-exception ISC
+RDEPEND=async? ( >=dev-ml/async-112.24.00:= ) lwt? ( >=dev-ml/lwt-2.4.7:= dev-ml/ocaml-cstruct:=[lwt(-)] ) >=dev-lang/ocaml-4:= dev-ml/cmdliner:= dev-ml/mirage-profile:= >=dev-ml/ocaml-base64-2.0.0:= >=dev-ml/ocaml-cstruct-1.0.1:= >=dev-ml/ocaml-ipaddr-2.6.0:= dev-ml/ocaml-re:= >=dev-ml/ocaml-uri-1.7.0:= !<dev-ml/mirage-types-1.2.0 !dev-ml/odns >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/0.15.3
+SRC_URI=https://github.com/mirage/ocaml-dns/archive/v0.15.3.tar.gz -> ocaml-dns-0.15.3.tar.gz
+_eclasses_=base	84d9f879f57a8316ff02be0373a3d6f9	eutils	43da5163ba106e87d22d2e7d6d67537f	findlib	9909e5ca0f77ff5b693885a3d7aeadb7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	oasis	1f8aac15a40bfb39dd98018626248fe1	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=ddf019589030777ff7df920c2b64acd1
diff --git a/metadata/md5-cache/dev-python/cffi-1.2.1 b/metadata/md5-cache/dev-python/cffi-1.2.1
index e5b275087014..fe08c68e6112 100644
--- a/metadata/md5-cache/dev-python/cffi-1.2.1
+++ b/metadata/md5-cache/dev-python/cffi-1.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=Foreign Function Interface for Python calling C code
 EAPI=5
 HOMEPAGE=http://cffi.readthedocs.org/ https://pypi.python.org/pypi/cffi
 IUSE=doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=MIT
 RDEPEND=virtual/libffi dev-python/pycparser[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/pytest[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/1.2.1
 SRC_URI=mirror://pypi/c/cffi/cffi-1.2.1.tar.gz
 _eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	43da5163ba106e87d22d2e7d6d67537f	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	9c405693f1f355a718700c5cffffd9e5	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=4bd03e9cfa1ace9b6ab8a7e8f6302cad
+_md5_=bf8540a60b2ca541f5f9e8db3197a996
diff --git a/metadata/md5-cache/dev-python/cryptography-1.0.2 b/metadata/md5-cache/dev-python/cryptography-1.0.2
index 0de351926edb..4b7ca95e0713 100644
--- a/metadata/md5-cache/dev-python/cryptography-1.0.2
+++ b/metadata/md5-cache/dev-python/cryptography-1.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Library providing cryptographic recipes and primitives
 EAPI=5
 HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/
 IUSE=libressl test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) python_targets_python2_7? ( >=dev-python/cffi-1.1.0:=[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_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_3? ( >=dev-python/cffi-1.1.0:=[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_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( >=dev-python/cffi-1.1.0:=[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_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( >=dev-python/cffi-1.1.0:=[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_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) python_targets_python3_3? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) python_targets_pypy? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) >=dev-python/idna-2.0[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] python_targets_python2_7? ( dev-python/ipaddress[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) python_targets_pypy? ( dev-python/ipaddress[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) >=dev-python/pyasn1-0.1.8[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] >=dev-python/six-1.4.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] python_targets_pypy? ( >=virtual/pypy-2.6.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 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-1.0.2.tar.gz
 _eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	43da5163ba106e87d22d2e7d6d67537f	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	9c405693f1f355a718700c5cffffd9e5	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=ef8de1dd7b07d691324034deb6592bfd
+_md5_=6315680b1b17552fb276efdd35cc8082
diff --git a/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.0 b/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.0
index 4678efba3ed9..f77b1b351a24 100644
--- a/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.0
+++ b/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Provides enhanced HTTPS support for httplib and urllib2 using PyOpen
 EAPI=5
 HOMEPAGE=https://github.com/cedadev/ndg_httpsclient/ https://pypi.python.org/pypi/ndg-httpsclient
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=dev-python/pyopenssl[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_5(-)?,-python_single_target_python3_5(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] 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 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3 )
 SLOT=0
 SRC_URI=mirror://pypi/n/ndg-httpsclient/ndg_httpsclient-0.4.0.tar.gz
 _eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	43da5163ba106e87d22d2e7d6d67537f	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	9c405693f1f355a718700c5cffffd9e5	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=a863eb46b3f3d0a1cf6b10b094bb84cc
+_md5_=4d59f6cb28c2b3c3bed4631725e8a0eb
diff --git a/metadata/md5-cache/dev-python/ply-3.6-r1 b/metadata/md5-cache/dev-python/ply-3.6-r1
index 4f05c228935b..c3e86ddc4839 100644
--- a/metadata/md5-cache/dev-python/ply-3.6-r1
+++ b/metadata/md5-cache/dev-python/ply-3.6-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Python Lex-Yacc library
 EAPI=5
 HOMEPAGE=http://www.dabeaz.com/ply/ https://pypi.python.org/pypi/ply
 IUSE=examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=BSD
 RDEPEND=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_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.dabeaz.com/ply/ply-3.6.tar.gz
 _eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	43da5163ba106e87d22d2e7d6d67537f	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	9c405693f1f355a718700c5cffffd9e5	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=98ac0908aff54ea3b14ad537b9c2346d
+_md5_=bf892e9e84fef7ff46739890229b15c7
diff --git a/metadata/md5-cache/dev-python/ply-3.8 b/metadata/md5-cache/dev-python/ply-3.8
index 26b0901369bf..449dcb35fb67 100644
--- a/metadata/md5-cache/dev-python/ply-3.8
+++ b/metadata/md5-cache/dev-python/ply-3.8
@@ -4,7 +4,7 @@ DESCRIPTION=Python Lex-Yacc library
 EAPI=5
 HOMEPAGE=http://www.dabeaz.com/ply/ https://pypi.python.org/pypi/ply
 IUSE=examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=BSD
 RDEPEND=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 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/ply/ply-3.8.tar.gz
 _eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	43da5163ba106e87d22d2e7d6d67537f	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	9c405693f1f355a718700c5cffffd9e5	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=91aa43f8c6150f72fb367fea3b554f01
+_md5_=d65ae03cb210019f753c76e79ca1bc42
diff --git a/metadata/md5-cache/dev-python/pycparser-2.14 b/metadata/md5-cache/dev-python/pycparser-2.14
index 808430ce2cd0..bde99991578d 100644
--- a/metadata/md5-cache/dev-python/pycparser-2.14
+++ b/metadata/md5-cache/dev-python/pycparser-2.14
@@ -4,11 +4,11 @@ DESCRIPTION=C parser and AST generator written in Python
 EAPI=5
 HOMEPAGE=https://github.com/eliben/pycparser
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=BSD
 RDEPEND=dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] 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 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycparser/pycparser-2.14.tar.gz
 _eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	43da5163ba106e87d22d2e7d6d67537f	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	9c405693f1f355a718700c5cffffd9e5	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	vcs-snapshot	2ecbc36efd3f6b8486f63fcf8530c1bd
-_md5_=83192d5538ad04769623690260fbf9ed
+_md5_=a3cbd77e1129b803f58f381dc2cb0b19
diff --git a/metadata/md5-cache/dev-python/pyopenssl-0.15.1 b/metadata/md5-cache/dev-python/pyopenssl-0.15.1
index 015f091b216f..62007f635106 100644
--- a/metadata/md5-cache/dev-python/pyopenssl-0.15.1
+++ b/metadata/md5-cache/dev-python/pyopenssl-0.15.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python interface to the OpenSSL library
 EAPI=5
 HOMEPAGE=http://pyopenssl.sourceforge.net/ https://launchpad.net/pyopenssl https://pypi.python.org/pypi/pyOpenSSL
 IUSE=doc examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/six-1.5.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] >=dev-python/cryptography-0.7[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)] 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 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyOpenSSL/pyOpenSSL-0.15.1.tar.gz
 _eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	43da5163ba106e87d22d2e7d6d67537f	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	9c405693f1f355a718700c5cffffd9e5	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=6e8e8ac0d34747444a95264951c7571a
+_md5_=255bf3965ed33941a1a61b32ba97243c
diff --git a/metadata/md5-cache/dev-python/requests-2.8.0 b/metadata/md5-cache/dev-python/requests-2.8.0
index f69337ae60b3..cca0c6f1650b 100644
--- a/metadata/md5-cache/dev-python/requests-2.8.0
+++ b/metadata/md5-cache/dev-python/requests-2.8.0
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP library for human beings
 EAPI=5
 HOMEPAGE=http://python-requests.org/ https://pypi.python.org/pypi/requests
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=app-misc/ca-certificates >=dev-python/chardet-2.2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] dev-python/ndg-httpsclient[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] >=dev-python/py-1.4.30[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] dev-python/pyopenssl[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_5(-)?,-python_single_target_python3_5(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] 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 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.8.0.tar.gz
 _eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	43da5163ba106e87d22d2e7d6d67537f	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	9c405693f1f355a718700c5cffffd9e5	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=fa2d346e01f39d8c415d7a7284f3a296
+_md5_=24bb6b92ea929553128d45802051cc89
diff --git a/metadata/md5-cache/dev-python/requests-2.8.1 b/metadata/md5-cache/dev-python/requests-2.8.1
index f3a3817d0c2d..3936c41df456 100644
--- a/metadata/md5-cache/dev-python/requests-2.8.1
+++ b/metadata/md5-cache/dev-python/requests-2.8.1
@@ -4,7 +4,7 @@ DESCRIPTION=HTTP library for human beings
 EAPI=5
 HOMEPAGE=http://python-requests.org/ https://pypi.python.org/pypi/requests
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=app-misc/ca-certificates >=dev-python/chardet-2.2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] dev-python/ndg-httpsclient[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] >=dev-python/py-1.4.30[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] dev-python/pyopenssl[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_5(-)?,-python_single_target_python3_5(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] 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 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_pypy python_targets_pypy3 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.8.1.tar.gz
 _eclasses_=distutils-r1	46506dd0dd992b3c89b0d00daabfd86c	eutils	43da5163ba106e87d22d2e7d6d67537f	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	9c405693f1f355a718700c5cffffd9e5	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=fa2d346e01f39d8c415d7a7284f3a296
+_md5_=24bb6b92ea929553128d45802051cc89
diff --git a/metadata/md5-cache/dev-util/android-studio-1.4.0.10.141.2288178-r1 b/metadata/md5-cache/dev-util/android-studio-1.4.0.10.141.2288178-r1
index cba68bd6eaf0..abf1bc4b5f67 100644
--- a/metadata/md5-cache/dev-util/android-studio-1.4.0.10.141.2288178-r1
+++ b/metadata/md5-cache/dev-util/android-studio-1.4.0.10.141.2288178-r1
@@ -6,9 +6,9 @@ HOMEPAGE=http://developer.android.com/sdk/installing/studio.html
 IUSE=selinux
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.7 selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] >=dev-libs/libffi-3.0.13-r1[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/freetype-2.5.5[abi_x86_32(-)] >=media-libs/libpng-1.2.51[abi_x86_32(-)] >=media-libs/mesa-10.2.8[abi_x86_32(-)] || ( >=sys-libs/ncurses-5.9-r3:0/5[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3:5/5[abi_x86_32(-)] ) >=sys-libs/zlib-1.2.8-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/libXdamage-1.1.4-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/libXfixes-5.0.1[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] >=x11-libs/libdrm-2.4.46[abi_x86_32(-)] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)]
+RDEPEND=>=virtual/jdk-1.7 selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] >=dev-libs/libffi-3.0.13-r1[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/freetype-2.5.5[abi_x86_32(-)] >=media-libs/libpng-1.2.51[abi_x86_32(-)] >=media-libs/mesa-10.2.8[abi_x86_32(-)] || ( >=sys-libs/ncurses-5.9-r3:5/5[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3:0/5[abi_x86_32(-)] ) >=sys-libs/zlib-1.2.8-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/libXdamage-1.1.4-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/libXfixes-5.0.1[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] >=x11-libs/libdrm-2.4.46[abi_x86_32(-)] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)] >=x11-libs/libxshmfence-1.1[abi_x86_32(-)]
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://dl.google.com/dl/android/studio/ide-zips/1.4.0.10/android-studio-ide-141.2288178-linux.zip
 _eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5e57b918196892eb9807620b895280c1
+_md5_=e11e3af2fe07f484f27c146a602231b1
diff --git a/metadata/md5-cache/dev-util/cmake-3.3.1-r1 b/metadata/md5-cache/dev-util/cmake-3.3.1-r1
index b2dd3f40e9e1..13ffbdeea106 100644
--- a/metadata/md5-cache/dev-util/cmake-3.3.1-r1
+++ b/metadata/md5-cache/dev-util/cmake-3.3.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Cross platform Make
 EAPI=5
 HOMEPAGE=http://www.cmake.org/
 IUSE=doc emacs system-jsoncpp ncurses qt4 qt5 test
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
 RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.20.0-r1[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 SLOT=0
 SRC_URI=http://www.cmake.org/files/v3.3/cmake-3.3.1.tar.gz http://www.cmake.org/gitweb?p=cmake.git;a=patch;h=b9ec9392da21a3421e48c6961976060d872faffb -> cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch
 _eclasses_=bash-completion-r1	b1fc4d30333bb528c8abb4332bb70ea6	cmake-utils	7dc05d514e5011a2a16bfa7a32e69587	elisp-common	73c48c11ad6a6494eda0d0cca848c8fa	eutils	43da5163ba106e87d22d2e7d6d67537f	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	7d550983f9b6adb3e7091f4090ddae2f
-_md5_=1a7882a95cf33a22d6c552bfc07125d1
+_md5_=050d9694ed1b84b84c362d2053a8afd7
diff --git a/metadata/md5-cache/dev-util/cmake-3.3.2-r1 b/metadata/md5-cache/dev-util/cmake-3.3.2-r1
index baf0170b07cd..df2909a69339 100644
--- a/metadata/md5-cache/dev-util/cmake-3.3.2-r1
+++ b/metadata/md5-cache/dev-util/cmake-3.3.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Cross platform Make
 EAPI=5
 HOMEPAGE=http://www.cmake.org/
 IUSE=doc emacs system-jsoncpp ncurses qt4 qt5 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=CMake
 RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=net-misc/curl-7.20.0-r1[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
 SLOT=0
 SRC_URI=http://www.cmake.org/files/v3.3/cmake-3.3.2.tar.gz http://www.cmake.org/gitweb?p=cmake.git;a=patch;h=b9ec9392da21a3421e48c6961976060d872faffb -> cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch
 _eclasses_=bash-completion-r1	b1fc4d30333bb528c8abb4332bb70ea6	cmake-utils	7dc05d514e5011a2a16bfa7a32e69587	elisp-common	73c48c11ad6a6494eda0d0cca848c8fa	eutils	43da5163ba106e87d22d2e7d6d67537f	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	7d550983f9b6adb3e7091f4090ddae2f
-_md5_=2a979765fa188adc9c032f4ea76df866
+_md5_=e00e93111dccf875c246ac48d7b6bc8e
diff --git a/metadata/md5-cache/dev-vcs/git-2.3.10 b/metadata/md5-cache/dev-vcs/git-2.3.10
index 29bddea52614..5d598f0ac44c 100644
--- a/metadata/md5-cache/dev-vcs/git-2.3.10
+++ b/metadata/md5-cache/dev-vcs/git-2.3.10
@@ -4,11 +4,11 @@ DESCRIPTION=GIT - the stupid content tracker, the revision control system heavil
 EAPI=5
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:0= 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/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_5(-),-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_5(-),-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_5(-),-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 ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://git-core.googlecode.com/files/git-2.3.10.tar.xz mirror://kernel/software/scm/git/git-2.3.10.tar.xz https://git-core.googlecode.com/files/git-manpages-2.3.10.tar.xz mirror://kernel/software/scm/git/git-manpages-2.3.10.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.3.10.tar.xz https://git-core.googlecode.com/files/git-htmldocs-2.3.10.tar.xz )
 _eclasses_=bash-completion-r1	b1fc4d30333bb528c8abb4332bb70ea6	elisp-common	73c48c11ad6a6494eda0d0cca848c8fa	eutils	43da5163ba106e87d22d2e7d6d67537f	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	perl-module	1cfb38bf68a24c8394e41d2f53003146	python-single-r1	612c783d1a1a182ad7ea4f2eb0b79e86	python-utils-r1	9c405693f1f355a718700c5cffffd9e5	systemd	6b4f0cefa642270eded7e6ca816fd181	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=1ea0fe1a7ee2d6a538e98b321a505ac3
+_md5_=bc96aa696fe426308607a7c5255ed942
diff --git a/metadata/md5-cache/dev-vcs/git-2.4.10 b/metadata/md5-cache/dev-vcs/git-2.4.10
index 97e42534f963..3283e6e638a9 100644
--- a/metadata/md5-cache/dev-vcs/git-2.4.10
+++ b/metadata/md5-cache/dev-vcs/git-2.4.10
@@ -4,11 +4,11 @@ DESCRIPTION=GIT - the stupid content tracker, the revision control system heavil
 EAPI=5
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:0= 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/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_5(-),-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_5(-),-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_5(-),-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 ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://git-core.googlecode.com/files/git-2.4.10.tar.xz mirror://kernel/software/scm/git/git-2.4.10.tar.xz https://git-core.googlecode.com/files/git-manpages-2.4.10.tar.xz mirror://kernel/software/scm/git/git-manpages-2.4.10.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.4.10.tar.xz https://git-core.googlecode.com/files/git-htmldocs-2.4.10.tar.xz )
 _eclasses_=bash-completion-r1	b1fc4d30333bb528c8abb4332bb70ea6	elisp-common	73c48c11ad6a6494eda0d0cca848c8fa	eutils	43da5163ba106e87d22d2e7d6d67537f	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multiprocessing	d769539d9bace6eaca30af23bc2b4dde	perl-module	1cfb38bf68a24c8394e41d2f53003146	python-single-r1	612c783d1a1a182ad7ea4f2eb0b79e86	python-utils-r1	9c405693f1f355a718700c5cffffd9e5	systemd	6b4f0cefa642270eded7e6ca816fd181	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	unpacker	1d149d9bda7723e740cfd28118f27813
-_md5_=52fcf765e3226e5aae1d73169a459c51
+_md5_=dc23ca9b225cf86bd98b257c72e4dc9d
diff --git a/metadata/md5-cache/dev-vcs/git-flow-1.8.0-r1 b/metadata/md5-cache/dev-vcs/git-flow-1.8.0-r1
index 2cb8338ad667..f780027d7733 100644
--- a/metadata/md5-cache/dev-vcs/git-flow-1.8.0-r1
+++ b/metadata/md5-cache/dev-vcs/git-flow-1.8.0-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Git extensions to provide high-level repository operations for Vincent Driessen's branching model
 EAPI=5
 HOMEPAGE=https://github.com/petervanderdoes/gitflow
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD MIT
 RDEPEND=dev-vcs/git
 SLOT=0
 SRC_URI=https://github.com/petervanderdoes/gitflow/archive/1.8.0.tar.gz -> git-flow-1.8.0.tar.gz https://github.com/petervanderdoes/git-flow-completion/archive/0.5.1.tar.gz -> git-flow-completion-0.5.1.tar.gz
 _eclasses_=bash-completion-r1	b1fc4d30333bb528c8abb4332bb70ea6	eutils	43da5163ba106e87d22d2e7d6d67537f	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=41028655bbb26a221178421001415d60
+_md5_=4b384598408d936ea0307391e32edfa9
diff --git a/metadata/md5-cache/games-strategy/openra-20120630 b/metadata/md5-cache/games-strategy/openra-20120630-r1
similarity index 82%
rename from metadata/md5-cache/games-strategy/openra-20120630
rename to metadata/md5-cache/games-strategy/openra-20120630-r1
index 6afcfd0495ab..91bd66527580 100644
--- a/metadata/md5-cache/games-strategy/openra-20120630
+++ b/metadata/md5-cache/games-strategy/openra-20120630-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl[X,opengl,video] media-libs/openal virtual/jpeg virtual/opengl cg? ( >=media-gfx/nvidia-cg-toolkit-2.1.0017 ) >=sys-apps/sed-4
+DEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl[X,opengl,video] media-libs/openal virtual/jpeg:0 virtual/opengl cg? ( >=media-gfx/nvidia-cg-toolkit-2.1.0017 ) >=sys-apps/sed-4
 DESCRIPTION=A free RTS engine supporting games like Command & Conquer and Red Alert
 EAPI=4
 HOMEPAGE=http://open-ra.org/
 IUSE=cg
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl[X,opengl,video] media-libs/openal virtual/jpeg virtual/opengl cg? ( >=media-gfx/nvidia-cg-toolkit-2.1.0017 ) games-misc/games-envd
+RDEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl[X,opengl,video] media-libs/openal virtual/jpeg:0 virtual/opengl cg? ( >=media-gfx/nvidia-cg-toolkit-2.1.0017 ) games-misc/games-envd
 SLOT=0
 SRC_URI=https://github.com/OpenRA/OpenRA/tarball/release-20120630 -> openra-20120630.tar.gz
 _eclasses_=base	84d9f879f57a8316ff02be0373a3d6f9	eutils	43da5163ba106e87d22d2e7d6d67537f	games	4dae170e58f773c484e07d18ef441804	gnome2-utils	588052cacdf74572e68bdfeaece20534	mono	3fb22ec265e021c7294a29e720f3d5f7	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	vcs-snapshot	2ecbc36efd3f6b8486f63fcf8530c1bd
-_md5_=c8658020867aa861bb08aedd6137fd3e
+_md5_=1ef6f842ae7b61f36fe0cf88869970e1
diff --git a/metadata/md5-cache/games-strategy/openra-20130514-r1 b/metadata/md5-cache/games-strategy/openra-20130514-r2
similarity index 82%
rename from metadata/md5-cache/games-strategy/openra-20130514-r1
rename to metadata/md5-cache/games-strategy/openra-20130514-r2
index 34946e36acb0..2a8f945266dd 100644
--- a/metadata/md5-cache/games-strategy/openra-20130514-r1
+++ b/metadata/md5-cache/games-strategy/openra-20130514-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl[X,opengl,video] media-libs/openal virtual/jpeg virtual/opengl cg? ( >=media-gfx/nvidia-cg-toolkit-2.1.0017 ) >=sys-apps/sed-4
+DEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl[X,opengl,video] media-libs/openal virtual/jpeg:0 virtual/opengl cg? ( >=media-gfx/nvidia-cg-toolkit-2.1.0017 ) >=sys-apps/sed-4
 DESCRIPTION=A free RTS engine supporting games like Command & Conquer and Red Alert
 EAPI=5
 HOMEPAGE=http://open-ra.org/
 IUSE=cg tools
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl[X,opengl,video] media-libs/openal virtual/jpeg virtual/opengl cg? ( >=media-gfx/nvidia-cg-toolkit-2.1.0017 ) games-misc/games-envd
+RDEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl[X,opengl,video] media-libs/openal virtual/jpeg:0 virtual/opengl cg? ( >=media-gfx/nvidia-cg-toolkit-2.1.0017 ) games-misc/games-envd
 SLOT=0
 SRC_URI=https://github.com/OpenRA/OpenRA/tarball/release-20130514 -> openra-20130514.tar.gz
 _eclasses_=base	84d9f879f57a8316ff02be0373a3d6f9	eutils	43da5163ba106e87d22d2e7d6d67537f	games	4dae170e58f773c484e07d18ef441804	gnome2-utils	588052cacdf74572e68bdfeaece20534	mono-env	10809200679bcceefebac9e72bebb6e6	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	vcs-snapshot	2ecbc36efd3f6b8486f63fcf8530c1bd
-_md5_=4a2b20588004e0ab474ed6179c5d3fe4
+_md5_=6f1dfdfe908f53eee5b105c869b4417b
diff --git a/metadata/md5-cache/games-strategy/openra-20131223-r1 b/metadata/md5-cache/games-strategy/openra-20131223-r2
similarity index 82%
rename from metadata/md5-cache/games-strategy/openra-20131223-r1
rename to metadata/md5-cache/games-strategy/openra-20131223-r2
index 64a6751c07b0..28721fc71aad 100644
--- a/metadata/md5-cache/games-strategy/openra-20131223-r1
+++ b/metadata/md5-cache/games-strategy/openra-20131223-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] || ( media-libs/libsdl[X,opengl,video] media-libs/libsdl2[X,opengl,video] ) media-libs/openal virtual/jpeg virtual/opengl >=sys-apps/sed-4
+DEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] || ( media-libs/libsdl[X,opengl,video] media-libs/libsdl2[X,opengl,video] ) media-libs/openal virtual/jpeg:0 virtual/opengl >=sys-apps/sed-4
 DESCRIPTION=A free RTS engine supporting games like Command & Conquer and Red Alert
 EAPI=5
 HOMEPAGE=http://open-ra.org/
 IUSE=tools
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] || ( media-libs/libsdl[X,opengl,video] media-libs/libsdl2[X,opengl,video] ) media-libs/openal virtual/jpeg virtual/opengl games-misc/games-envd
+RDEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] || ( media-libs/libsdl[X,opengl,video] media-libs/libsdl2[X,opengl,video] ) media-libs/openal virtual/jpeg:0 virtual/opengl games-misc/games-envd
 SLOT=0
 SRC_URI=https://github.com/OpenRA/OpenRA/tarball/release-20131223 -> openra-20131223.tar.gz
 _eclasses_=base	84d9f879f57a8316ff02be0373a3d6f9	eutils	43da5163ba106e87d22d2e7d6d67537f	games	4dae170e58f773c484e07d18ef441804	gnome2-utils	588052cacdf74572e68bdfeaece20534	mono-env	10809200679bcceefebac9e72bebb6e6	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	vcs-snapshot	2ecbc36efd3f6b8486f63fcf8530c1bd
-_md5_=7342f491b72fcf4ea3b8cffd1397ec5b
+_md5_=dd47cb0f6f5de38986a8897bcf859dbb
diff --git a/metadata/md5-cache/games-strategy/openra-20140608 b/metadata/md5-cache/games-strategy/openra-20140608-r1
similarity index 88%
rename from metadata/md5-cache/games-strategy/openra-20140608
rename to metadata/md5-cache/games-strategy/openra-20140608-r1
index bead5e5657a6..3333f24608f9 100644
--- a/metadata/md5-cache/games-strategy/openra-20140608
+++ b/metadata/md5-cache/games-strategy/openra-20140608-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl2[X,opengl,video] media-libs/openal virtual/jpeg virtual/opengl >=sys-apps/sed-4
+DEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl2[X,opengl,video] media-libs/openal virtual/jpeg:0 virtual/opengl >=sys-apps/sed-4
 DESCRIPTION=A free RTS engine supporting games like Command & Conquer and Red Alert
 EAPI=5
 HOMEPAGE=http://open-ra.org/
 IUSE=tools
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl2[X,opengl,video] media-libs/openal virtual/jpeg virtual/opengl games-misc/games-envd
+RDEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl2[X,opengl,video] media-libs/openal virtual/jpeg:0 virtual/opengl games-misc/games-envd
 SLOT=0
 SRC_URI=https://github.com/OpenRA/OpenRA/tarball/release-20140608 -> openra-20140608.tar.gz
 _eclasses_=base	84d9f879f57a8316ff02be0373a3d6f9	eutils	43da5163ba106e87d22d2e7d6d67537f	games	4dae170e58f773c484e07d18ef441804	gnome2-utils	588052cacdf74572e68bdfeaece20534	mono-env	10809200679bcceefebac9e72bebb6e6	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	vcs-snapshot	2ecbc36efd3f6b8486f63fcf8530c1bd
-_md5_=856cf9445722d0f732950bc784c923ba
+_md5_=253f3a6bccc0c9600a330cbc0a08cec7
diff --git a/metadata/md5-cache/games-strategy/openra-20140722 b/metadata/md5-cache/games-strategy/openra-20140722-r1
similarity index 88%
rename from metadata/md5-cache/games-strategy/openra-20140722
rename to metadata/md5-cache/games-strategy/openra-20140722-r1
index d5f9efa8f36c..42ff2f008363 100644
--- a/metadata/md5-cache/games-strategy/openra-20140722
+++ b/metadata/md5-cache/games-strategy/openra-20140722-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl2[X,opengl,video] media-libs/openal virtual/jpeg virtual/opengl >=sys-apps/sed-4
+DEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl2[X,opengl,video] media-libs/openal virtual/jpeg:0 virtual/opengl >=sys-apps/sed-4
 DESCRIPTION=A free RTS engine supporting games like Command & Conquer and Red Alert
 EAPI=5
 HOMEPAGE=http://open-ra.org/
 IUSE=tools
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl2[X,opengl,video] media-libs/openal virtual/jpeg virtual/opengl games-misc/games-envd
+RDEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl2[X,opengl,video] media-libs/openal virtual/jpeg:0 virtual/opengl games-misc/games-envd
 SLOT=0
 SRC_URI=https://github.com/OpenRA/OpenRA/tarball/release-20140722 -> openra-20140722.tar.gz
 _eclasses_=base	84d9f879f57a8316ff02be0373a3d6f9	eutils	43da5163ba106e87d22d2e7d6d67537f	games	4dae170e58f773c484e07d18ef441804	gnome2-utils	588052cacdf74572e68bdfeaece20534	mono-env	10809200679bcceefebac9e72bebb6e6	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	vcs-snapshot	2ecbc36efd3f6b8486f63fcf8530c1bd
-_md5_=263b34817a2b4a4405f00d8b6945ce0f
+_md5_=5f2b8e64b480fba9c94657111ebc060e
diff --git a/metadata/md5-cache/games-strategy/openra-20141029-r1 b/metadata/md5-cache/games-strategy/openra-20141029-r2
similarity index 88%
rename from metadata/md5-cache/games-strategy/openra-20141029-r1
rename to metadata/md5-cache/games-strategy/openra-20141029-r2
index 76467234aeeb..4e8533742c0e 100644
--- a/metadata/md5-cache/games-strategy/openra-20141029-r1
+++ b/metadata/md5-cache/games-strategy/openra-20141029-r2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl2[X,opengl,video] media-libs/openal virtual/jpeg virtual/opengl >=sys-apps/sed-4
+DEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl2[X,opengl,video] media-libs/openal virtual/jpeg:0 virtual/opengl >=sys-apps/sed-4
 DESCRIPTION=A free RTS engine supporting games like Command & Conquer and Red Alert
 EAPI=5
 HOMEPAGE=http://open-ra.org/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl2[X,opengl,video] media-libs/openal virtual/jpeg virtual/opengl games-misc/games-envd
+RDEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl2[X,opengl,video] media-libs/openal virtual/jpeg:0 virtual/opengl games-misc/games-envd
 SLOT=0
 SRC_URI=https://github.com/OpenRA/OpenRA/tarball/release-20141029 -> openra-20141029.tar.gz
 _eclasses_=base	84d9f879f57a8316ff02be0373a3d6f9	eutils	43da5163ba106e87d22d2e7d6d67537f	games	4dae170e58f773c484e07d18ef441804	gnome2-utils	588052cacdf74572e68bdfeaece20534	mono-env	10809200679bcceefebac9e72bebb6e6	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	vcs-snapshot	2ecbc36efd3f6b8486f63fcf8530c1bd
-_md5_=c907eb5bba3ddb930fa964ae24cc02c3
+_md5_=7fe7c615d39252317114f3410989fd64
diff --git a/metadata/md5-cache/kde-base/kactivitymanagerd-4.13.3 b/metadata/md5-cache/kde-base/kactivitymanagerd-4.13.3-r1
similarity index 74%
rename from metadata/md5-cache/kde-base/kactivitymanagerd-4.13.3
rename to metadata/md5-cache/kde-base/kactivitymanagerd-4.13.3-r1
index 388c5f49dfc9..462d4b8f799e 100644
--- a/metadata/md5-cache/kde-base/kactivitymanagerd-4.13.3
+++ b/metadata/md5-cache/kde-base/kactivitymanagerd-4.13.3-r1
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=aqua
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=!<kde-base/kactivitymanager-4.14.3-r1 !kde-frameworks/kactivities kde-apps/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.13.3:4[aqua=]
+RDEPEND=!<kde-base/kactivities-4.13.3-r1 !kde-frameworks/kactivities kde-apps/oxygen-icons dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.13.3:4[aqua=]
 SLOT=4/4.13
 SRC_URI=mirror://kde/stable/applications/4.13.3/src/kactivities-4.13.3.tar.xz
 _eclasses_=cmake-utils	7dc05d514e5011a2a16bfa7a32e69587	eutils	43da5163ba106e87d22d2e7d6d67537f	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	588052cacdf74572e68bdfeaece20534	kde4-base	3df03af401241a38d050aa4c2c7bc399	kde4-functions	3b68b9a6265fb2bd834efa55716107e8	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	7d550983f9b6adb3e7091f4090ddae2f
-_md5_=826acce52907f46a606797534abe0f0f
+_md5_=b63a51eb0376971b059e34c01dfd4b97
diff --git a/metadata/md5-cache/kde-base/kdelibs-4.14.12 b/metadata/md5-cache/kde-base/kdelibs-4.14.12
deleted file mode 100644
index 09f7dc4e012d..000000000000
--- a/metadata/md5-cache/kde-base/kdelibs-4.14.12
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DEPEND=>=app-misc/strigi-0.7.7 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 >=dev-libs/libdbusmenu-qt-0.3.2[qt4(+)] dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib media-libs/libpng:0= media-libs/phonon[qt4] sys-libs/zlib virtual/jpeg:0 >=x11-misc/shared-mime-info-0.60 acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) ) bzip2? ( app-arch/bzip2 ) crypt? ( app-crypt/qca:2[qt4(+)] ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) policykit? ( >=sys-auth/polkit-qt-0.103.0[qt4(+)] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl:0 ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) doc? ( app-doc/doxygen ) nls? ( virtual/libintl ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.3.1-r1 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) test? ( dev-util/cppunit ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) >=dev-qt/qtdeclarative-4.8.5:4 opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4
-DESCRIPTION=KDE libraries needed by all KDE programs
-EAPI=5
-HOMEPAGE=https://www.kde.org/
-IUSE=cpu_flags_x86_3dnow acl alsa altivec +bzip2 +crypt debug doc fam jpeg2k kerberos lzma cpu_flags_x86_mmx nls openexr +policykit spell cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf opengl test +handbook aqua
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-PDEPEND=>=kde-base/katepart-4.14.3:4[aqua=] || ( >=kde-apps/kfmclient-4.14.3:4[aqua=] x11-misc/xdg-utils ) handbook? ( || ( >=kde-base/khelpcenter-4.14.3:4[aqua=] kde-plasma/khelpcenter:5[compat(+)] ) ) policykit? ( || ( >=sys-auth/polkit-kde-agent-0.99 kde-plasma/polkit-kde-agent ) )
-RDEPEND=>=app-misc/strigi-0.7.7 app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libattica-0.4.2 >=dev-libs/libdbusmenu-qt-0.3.2[qt4(+)] dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt media-libs/fontconfig media-libs/freetype:2 media-libs/giflib media-libs/libpng:0= media-libs/phonon[qt4] sys-libs/zlib virtual/jpeg:0 >=x11-misc/shared-mime-info-0.60 acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) ) bzip2? ( app-arch/bzip2 ) crypt? ( app-crypt/qca:2[qt4(+)] ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) policykit? ( >=sys-auth/polkit-qt-0.103.0[qt4(+)] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl:0 ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !dev-qt/qtphonon !<=kde-base/plasma-workspace-4.7.1:4 !<=kde-base/kcontrol-4.4.50:4 >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates >=kde-base/kde-env-4.14.3:4[aqua=] sys-apps/dbus[X] !aqua? ( udisks? ( sys-fs/udisks:2 ) x11-apps/iceauth x11-apps/rgb >=x11-misc/xdg-utils-1.0.2-r3 upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) ) udev? ( app-misc/media-player-info ) kde-apps/oxygen-icons >=dev-qt/qtdeclarative-4.8.5:4 opengl? ( >=dev-qt/qtopengl-4.8.5:4 ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4
-REQUIRED_USE=udisks? ( udev ) upower? ( udev )
-RESTRICT=test
-SLOT=4/4.14
-SRC_URI=mirror://kde/stable/applications/15.08.1/src/kdelibs-4.14.12.tar.xz
-_eclasses_=cmake-utils	7dc05d514e5011a2a16bfa7a32e69587	eutils	43da5163ba106e87d22d2e7d6d67537f	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	gnome2-utils	588052cacdf74572e68bdfeaece20534	kde4-base	3df03af401241a38d050aa4c2c7bc399	kde4-functions	3b68b9a6265fb2bd834efa55716107e8	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	7d550983f9b6adb3e7091f4090ddae2f
-_md5_=8310ede49be7259557fcb775938225f0
diff --git a/metadata/md5-cache/media-libs/libass-0.12.3 b/metadata/md5-cache/media-libs/libass-0.12.3
index c03dd075d588..4b815360c9b1 100644
--- a/metadata/md5-cache/media-libs/libass-0.12.3
+++ b/metadata/md5-cache/media-libs/libass-0.12.3
@@ -4,10 +4,10 @@ DESCRIPTION=Library for SSA/ASS subtitles rendering
 EAPI=5
 HOMEPAGE=https://github.com/libass/libass
 IUSE=+enca +fontconfig +harfbuzz static-libs 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
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=ISC
 RDEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[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(-)?] ) >=media-libs/freetype-2.5.0.1: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(-)?] >=virtual/libiconv-0-r1[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(-)?] >=dev-libs/fribidi-0.19.5-r1[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(-)?] harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,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(-)?] ) enca? ( >=app-i18n/enca-1.14-r1[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(-)?] )
 SLOT=0/5
 SRC_URI=https://github.com/libass/libass/releases/download/0.12.3/libass-0.12.3.tar.xz
 _eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multilib-build	c47eec09e82c8a750127ff2abf0745b1	multilib-minimal	a93a9b4153a5f1c746bdd3b20ef9d834	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=b689070fd4a3d81a5a32cb58405bd5f3
+_md5_=ca37076580016b5711f75d5a883b7617
diff --git a/metadata/md5-cache/media-libs/smpeg-0.4.4-r10 b/metadata/md5-cache/media-libs/smpeg-0.4.4-r10
index 60c3b131cf65..646c495bd2a6 100644
--- a/metadata/md5-cache/media-libs/smpeg-0.4.4-r10
+++ b/metadata/md5-cache/media-libs/smpeg-0.4.4-r10
@@ -10,4 +10,4 @@ RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<=app-e
 SLOT=0
 SRC_URI=ftp://ftp.lokigames.com/pub/open-source/smpeg/smpeg-0.4.4.tar.gz mirror://gentoo/smpeg-0.4.4-gtkm4.patch.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	43da5163ba106e87d22d2e7d6d67537f	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	7f78cd7d403808a350c9ae23f5821fb4	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	multilib-build	c47eec09e82c8a750127ff2abf0745b1	multilib-minimal	a93a9b4153a5f1c746bdd3b20ef9d834	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=6a1a5cb9f6db2b290fef08b254f349ee
+_md5_=92e96d331880a0aaa0751a9b9110a627
diff --git a/metadata/md5-cache/media-sound/gejengel-0.1.4-r2 b/metadata/md5-cache/media-sound/gejengel-0.1.4-r2
new file mode 100644
index 000000000000..53aee8d1e489
--- /dev/null
+++ b/metadata/md5-cache/media-sound/gejengel-0.1.4-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-cpp/gtkmm:2.4 dev-cpp/pangomm:1.4 media-libs/taglib dev-db/sqlite:3 || ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[imagemagick] ) mad? ( media-libs/libmad ) flac? ( media-libs/flac[cxx] ) ffmpeg? ( >=virtual/ffmpeg-9 ) audioscrobbler? ( >=media-libs/lastfmlib-0.4 ) dbus? ( dev-libs/dbus-glib ) libnotify? ( x11-libs/libnotify ) openal? ( media-libs/openal ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) dev-libs/libxdg-basedir dev-util/intltool >=sys-devel/automake-1.11 !<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=Lightweight audio player
+EAPI=4
+HOMEPAGE=https://github.com/dirkvdb/gejengel
+IUSE=+alsa audioscrobbler debug dbus +ffmpeg flac libnotify mad openal pulseaudio syslog
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-cpp/gtkmm:2.4 dev-cpp/pangomm:1.4 media-libs/taglib dev-db/sqlite:3 || ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[imagemagick] ) mad? ( media-libs/libmad ) flac? ( media-libs/flac[cxx] ) ffmpeg? ( >=virtual/ffmpeg-9 ) audioscrobbler? ( >=media-libs/lastfmlib-0.4 ) dbus? ( dev-libs/dbus-glib ) libnotify? ( x11-libs/libnotify ) openal? ( media-libs/openal ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio )
+SLOT=0
+SRC_URI=https://gejengel.googlecode.com/files/gejengel-0.1.4.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	43da5163ba106e87d22d2e7d6d67537f	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=47e3df6e579b03cf9f7df122047a0640
diff --git a/metadata/md5-cache/media-sound/ncmpc-0.24-r1 b/metadata/md5-cache/media-sound/ncmpc-0.24-r2
similarity index 69%
rename from metadata/md5-cache/media-sound/ncmpc-0.24-r1
rename to metadata/md5-cache/media-sound/ncmpc-0.24-r2
index 278db9e638f7..80da12537de8 100644
--- a/metadata/md5-cache/media-sound/ncmpc-0.24-r1
+++ b/metadata/md5-cache/media-sound/ncmpc-0.24-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure prepare
-DEPEND=>=dev-libs/glib-2.12:2 >=media-libs/libmpdclient-2.3 sys-libs/ncurses lirc? ( app-misc/lirc ) nls? ( sys-libs/ncurses[unicode] ) app-arch/xz-utils virtual/pkgconfig !<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
+DEPEND=>=dev-libs/glib-2.12:2 >=media-libs/libmpdclient-2.3 sys-libs/ncurses[unicode] lirc? ( app-misc/lirc ) app-arch/xz-utils virtual/pkgconfig !<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=A ncurses client for the Music Player Daemon (MPD)
 EAPI=5
 HOMEPAGE=http://www.musicpd.org/clients/ncmpc/
 IUSE=artist-screen chat-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen
 KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.12:2 >=media-libs/libmpdclient-2.3 sys-libs/ncurses lirc? ( app-misc/lirc ) nls? ( sys-libs/ncurses[unicode] )
+RDEPEND=>=dev-libs/glib-2.12:2 >=media-libs/libmpdclient-2.3 sys-libs/ncurses[unicode] lirc? ( app-misc/lirc )
 SLOT=0
 SRC_URI=http://www.musicpd.org/download/ncmpc/0/ncmpc-0.24.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	43da5163ba106e87d22d2e7d6d67537f	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=53dc1cc485ef0913b03c0cdf768ccdff
+_md5_=a9bffc8aedbc7f4d9dc61eada238024c
diff --git a/metadata/md5-cache/media-sound/ncmpcpp-0.6.7 b/metadata/md5-cache/media-sound/ncmpcpp-0.6.7
index 598c45c4b7cf..2467cc811d77 100644
--- a/metadata/md5-cache/media-sound/ncmpcpp-0.6.7
+++ b/metadata/md5-cache/media-sound/ncmpcpp-0.6.7
@@ -4,10 +4,10 @@ DESCRIPTION=featureful ncurses based MPD client inspired by ncmpc
 EAPI=5
 HOMEPAGE=http://ncmpcpp.rybczak.net/
 IUSE=clock curl outputs taglib unicode visualizer
-KEYWORDS=amd64 ~arm hppa ~ppc ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~arm hppa ~ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmpdclient-2.1 curl? ( net-misc/curl ) dev-libs/boost:=[nls,threads] sys-libs/ncurses[unicode?] sys-libs/readline:* taglib? ( media-libs/taglib ) visualizer? ( sci-libs/fftw:3.0 )
 SLOT=0
 SRC_URI=http://ncmpcpp.rybczak.net/stable/ncmpcpp-0.6.7.tar.bz2
 _eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=5901e1548668b385204e66ab2c6ef98c
+_md5_=8fb838b48cec93364137f9110052d981
diff --git a/metadata/md5-cache/net-analyzer/w3af-1.1-r1 b/metadata/md5-cache/net-analyzer/w3af-1.1-r1
index 2a81b2e97f9b..aabfb48f4b28 100644
--- a/metadata/md5-cache/net-analyzer/w3af-1.1-r1
+++ b/metadata/md5-cache/net-analyzer/w3af-1.1-r1
@@ -3,11 +3,11 @@ DESCRIPTION=Web Application Attack and Audit Framework
 EAPI=5
 HOMEPAGE=http://w3af.sourceforge.net/
 IUSE=doc gtk python_targets_python2_7
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/fpconst-0.7.2[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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/nltk[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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/pybloomfiltermmap[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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/pyopenssl[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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/pyPdf[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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/python-cluster[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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/soappy[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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/pysvn[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-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(+)] || ( net-analyzer/gnu-netcat net-analyzer/netcat net-analyzer/netcat6 ) >=net-analyzer/scapy-2 gtk? ( media-gfx/graphviz >dev-python/pygtk-2.0 dev-python/pygtksourceview )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/w3af/w3af-1.1.tar.bz2
 _eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	python-single-r1	612c783d1a1a182ad7ea4f2eb0b79e86	python-utils-r1	9c405693f1f355a718700c5cffffd9e5	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=779c02cafcee09890894ea25c9db4556
+_md5_=bf14225c5f68b76a9e3e9ec2081db7d7
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.10.3 b/metadata/md5-cache/net-dns/bind-tools-9.10.3
index e5b39a1b290d..ed10f0129c5c 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.10.3
+++ b/metadata/md5-cache/net-dns/bind-tools-9.10.3
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.isc.org/isc/bind9/9.10.3/bind-9.10.3.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	43da5163ba106e87d22d2e7d6d67537f	flag-o-matic	85dc1eac3c64d8141374490ed64122e5	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=8ba1b548d9d44271f93293e919a5016a
+_md5_=ffbd2d2a2129804d3c68e5bef001ff43
diff --git a/metadata/md5-cache/net-misc/asterisk-11.19.0-r2 b/metadata/md5-cache/net-misc/asterisk-11.19.0-r2
new file mode 100644
index 000000000000..9b393b5d67c5
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-11.19.0-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup unpack
+DEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 !net-libs/pjsip voicemail_storage_imap? ( virtual/imap-c-client ) virtual/pkgconfig !<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 virtual/pkgconfig
+DESCRIPTION=Asterisk: A Modular Open Source PBX System
+EAPI=5
+HOMEPAGE=http://www.asterisk.org/
+IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound
+RDEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp ) vorbis? ( media-libs/libvorbis ) selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )
+REQUIRED_USE=gtalk? ( xmpp ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
+SLOT=0
+SRC_URI=http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-11.19.0.tar.gz mirror://gentoo/gentoo-asterisk-patchset-3.16.tar.bz2
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	43da5163ba106e87d22d2e7d6d67537f	libtool	7f78cd7d403808a350c9ae23f5821fb4	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	systemd	6b4f0cefa642270eded7e6ca816fd181	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=3aa6507ed6407a95a895b1df4fd74880
diff --git a/metadata/md5-cache/net-misc/asterisk-13.5.0-r2 b/metadata/md5-cache/net-misc/asterisk-13.5.0-r2
new file mode 100644
index 000000000000..9cf7d156d68e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-13.5.0-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup unpack
+DEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 !net-libs/pjsip voicemail_storage_imap? ( virtual/imap-c-client ) virtual/pkgconfig !<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 virtual/pkgconfig
+DESCRIPTION=Asterisk: A Modular Open Source PBX System
+EAPI=5
+HOMEPAGE=http://www.asterisk.org/
+IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound
+RDEPEND=dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) sys-libs/ncurses sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( dev-libs/ilbc-rfc3951 ) xmpp? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp ) vorbis? ( media-libs/libvorbis ) selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )
+REQUIRED_USE=gtalk? ( xmpp ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
+SLOT=0
+SRC_URI=http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.5.0.tar.gz mirror://gentoo/gentoo-asterisk-patchset-4.02.tar.bz2
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	84d9f879f57a8316ff02be0373a3d6f9	eutils	43da5163ba106e87d22d2e7d6d67537f	libtool	7f78cd7d403808a350c9ae23f5821fb4	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	systemd	6b4f0cefa642270eded7e6ca816fd181	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=729c54fc7aeaceb7424304678441fe13
diff --git a/metadata/md5-cache/net-p2p/i2p-0.9.22 b/metadata/md5-cache/net-p2p/i2p-0.9.22
index 52623cf95f62..e5aacfe17822 100644
--- a/metadata/md5-cache/net-p2p/i2p-0.9.22
+++ b/metadata/md5-cache/net-p2p/i2p-0.9.22
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/java-service-wrapper:0 dev-java/eclipse-ecj:* dev-libs/gmp:* nls? ( sys-devel/gettext ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 virtual/pkgconfig
+DEPEND=dev-java/jrobin:0 dev-java/bcprov:1.50 dev-java/slf4j-api:0 dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 dev-java/java-service-wrapper:0 dev-java/eclipse-ecj:* dev-libs/gmp:* nls? ( sys-devel/gettext ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 virtual/pkgconfig
 DESCRIPTION=A privacy-centric, anonymous network.
 EAPI=5
 HOMEPAGE=https://geti2p.net
 IUSE=nls elibc_FreeBSD elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2
-RDEPEND=dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/java-service-wrapper:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0
+RDEPEND=dev-java/jrobin:0 dev-java/bcprov:1.50 dev-java/slf4j-api:0 dev-java/tomcat-jstl-impl:0 dev-java/tomcat-jstl-spec:0 dev-java/java-service-wrapper:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=https://download.i2p2.de/releases/0.9.22/i2psource_0.9.22.tar.bz2
 _eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	java-ant-2	946f77f25d457a91a2188c26f3e50b3e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	c059b30d6a4df7cf32e2c98c1da1c9b5	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	systemd	6b4f0cefa642270eded7e6ca816fd181	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ef2fea5b12b5062c68b2c9a00187e038
+_md5_=b4b7e7924555ea47a0dbec02539f061d
diff --git a/metadata/md5-cache/net-p2p/i2p-0.9.22-r1 b/metadata/md5-cache/net-p2p/i2p-0.9.22-r1
new file mode 100644
index 000000000000..52623cf95f62
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/i2p-0.9.22-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/java-service-wrapper:0 dev-java/eclipse-ecj:* dev-libs/gmp:* nls? ( sys-devel/gettext ) >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 virtual/pkgconfig
+DESCRIPTION=A privacy-centric, anonymous network.
+EAPI=5
+HOMEPAGE=https://geti2p.net
+IUSE=nls elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2
+RDEPEND=dev-java/jrobin:0 dev-java/slf4j-api:0 dev-java/java-service-wrapper:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0
+SLOT=0
+SRC_URI=https://download.i2p2.de/releases/0.9.22/i2psource_0.9.22.tar.bz2
+_eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	java-ant-2	946f77f25d457a91a2188c26f3e50b3e	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-utils-2	c059b30d6a4df7cf32e2c98c1da1c9b5	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	systemd	6b4f0cefa642270eded7e6ca816fd181	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=ef2fea5b12b5062c68b2c9a00187e038
diff --git a/metadata/md5-cache/net-p2p/pybitmessage-0.4.4 b/metadata/md5-cache/net-p2p/pybitmessage-0.4.4
new file mode 100644
index 000000000000..dcae60d6b4a7
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/pybitmessage-0.4.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/sed-4
+DESCRIPTION=P2P communications protocol
+EAPI=5
+HOMEPAGE=https://bitmessage.org
+IUSE=libressl python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/Bitmessage/PyBitmessage/archive/v0.4.4.tar.gz -> pybitmessage-0.4.4.tar.gz
+_eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	gnome2-utils	588052cacdf74572e68bdfeaece20534	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	9c405693f1f355a718700c5cffffd9e5	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=83f32b1ecf917bbc115537b988c03e29
diff --git a/metadata/md5-cache/net-p2p/pybitmessage-9999 b/metadata/md5-cache/net-p2p/pybitmessage-9999
index e2c485598c2e..c3abe7a4c846 100644
--- a/metadata/md5-cache/net-p2p/pybitmessage-9999
+++ b/metadata/md5-cache/net-p2p/pybitmessage-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/sed-4 dev-vcs/git
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=P2P communications protocol
 EAPI=5
 HOMEPAGE=https://bitmessage.org
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
-_eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	git-2	1bb87192831f668cd20d93ffb1689c94	gnome2-utils	588052cacdf74572e68bdfeaece20534	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	9c405693f1f355a718700c5cffffd9e5	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=0ca0677e37d2f48b7f1dceae3cc3cb78
+_eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	git-r3	1502b9838d043db47700b8120083e637	gnome2-utils	588052cacdf74572e68bdfeaece20534	multibuild	ce2c2ede0c914b77f5dfc4e2ff2d0249	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	python-r1	32b376cbb100a3a8083b3a0de023e117	python-utils-r1	9c405693f1f355a718700c5cffffd9e5	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
+_md5_=c0203d9fdc00d3e5adb164691634a2c1
diff --git a/metadata/md5-cache/net-p2p/transmission-2.84-r3 b/metadata/md5-cache/net-p2p/transmission-2.84-r3
index 20d5c2180001..853c5f67ccf4 100644
--- a/metadata/md5-cache/net-p2p/transmission-2.84-r3
+++ b/metadata/md5-cache/net-p2p/transmission-2.84-r3
@@ -4,11 +4,11 @@ DESCRIPTION=A Fast, Easy and Free BitTorrent client
 EAPI=5
 HOMEPAGE=http://www.transmissionbt.com/
 IUSE=ayatana gtk lightweight systemd qt4 qt5 xfs
-KEYWORDS=~amd64 ~arm ~mips ~ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux
+KEYWORDS=amd64 ~arm ~mips ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux
 LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
 RDEPEND=>=dev-libs/libevent-2.0.10:= dev-libs/openssl:0= net-libs/libnatpmp:= >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3:=[ssl] sys-libs/zlib:= gtk? ( >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.32:2= >=x11-libs/gtk+-3.4:3= ayatana? ( >=dev-libs/libappindicator-0.4.90:3= ) ) systemd? ( sys-apps/systemd:= ) qt4? ( dev-qt/qtcore:4= dev-qt/qtgui:4= dev-qt/qtdbus:4= ) qt5? ( dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtnetwork:5= dev-qt/qtwidgets:5= )
 REQUIRED_USE=ayatana? ( gtk ) ?? ( qt4 qt5 )
 SLOT=0
 SRC_URI=http://download.transmissionbt.com/transmission/files/transmission-2.84.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	43da5163ba106e87d22d2e7d6d67537f	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	qmake-utils	05b63bb5c708c5903a9de5c58c8e43c8	systemd	6b4f0cefa642270eded7e6ca816fd181	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	user	906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=c13d9970de52457098f0c855278e5a8f
+_md5_=8ea7af40d59406f1ee7da5b7b6965670
diff --git a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.108.8 b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.108.8
index 1ba8bc0163ef..80d50ee26247 100644
--- a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.108.8
+++ b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.108.8
@@ -4,11 +4,11 @@ DESCRIPTION=Kernel sources with OpenVZ patchset
 EAPI=5
 HOMEPAGE=http://www.openvz.org
 IUSE=symlink build
-KEYWORDS=~amd64 ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~ppc64 ~sparc x86
 LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=2.6.32.108.8
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.xz http://download.openvz.org/kernel/branches/rhel6-2.6.32/042stab108.8/patches/patch-042stab108.8-combined.gz
 _eclasses_=eutils	43da5163ba106e87d22d2e7d6d67537f	kernel-2	7bbc05b42cbfd1ed8b4f9837d1e43df2	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	python-any-r1	b81ab4852d108e3d9c940fa03bce80e1	python-utils-r1	9c405693f1f355a718700c5cffffd9e5	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7950d880af469269985e2ede575c1fac
+_md5_=0b4f628d6459d959affe7de0eee1ef67
diff --git a/metadata/md5-cache/www-apps/dokuwiki-20140929d-r1 b/metadata/md5-cache/www-apps/dokuwiki-20140929d-r1
index ce631e688d1d..6d651f417e2f 100644
--- a/metadata/md5-cache/www-apps/dokuwiki-20140929d-r1
+++ b/metadata/md5-cache/www-apps/dokuwiki-20140929d-r1
@@ -4,10 +4,10 @@ DESCRIPTION=DokuWiki is a simple to use Wiki aimed at a small company's document
 EAPI=5
 HOMEPAGE=http://wiki.splitbrain.org/wiki:dokuwiki
 IUSE=gd vhosts
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/php-5.3[xml] virtual/httpd-php:* gd? ( || ( dev-lang/php[gd] media-gfx/imagemagick ) ) >=app-admin/webapp-config-1.50.15
 SLOT=20140929d-r1
 SRC_URI=http://download.dokuwiki.org/src/dokuwiki/dokuwiki-2014-09-29d.tgz
 _eclasses_=webapp	42c6ef7af496b228f9854b3c81e4b226
-_md5_=801f4a86eb873d61ba4734f7c6e13874
+_md5_=3a47b13e8d4d493ca975a1f3df6f8e20
diff --git a/metadata/md5-cache/x11-libs/goffice-0.8.17-r2 b/metadata/md5-cache/x11-libs/goffice-0.8.17-r2
new file mode 100644
index 000000000000..b1bea6336511
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/goffice-0.8.17-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.16:2 >=gnome-extra/libgsf-1.14.9 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.8.1 >=x11-libs/cairo-1.2[svg] x11-libs/libXext x11-libs/libXrender >=x11-libs/gtk+-2.16:2 gnome? ( >=gnome-base/gconf-2:2 ) virtual/pkgconfig >=dev-util/intltool-0.35 dev-util/gtk-doc-am gnome-base/gnome-common !<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 app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=A library of document-centric objects and utilities
+EAPI=5
+HOMEPAGE=https://git.gnome.org/browse/goffice/
+IUSE=gnome
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.16:2 >=gnome-extra/libgsf-1.14.9 >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.8.1 >=x11-libs/cairo-1.2[svg] x11-libs/libXext x11-libs/libXrender >=x11-libs/gtk+-2.16:2 gnome? ( >=gnome-base/gconf-2:2 )
+SLOT=0.8
+SRC_URI=mirror://gnome/sources/goffice/0.8/goffice-0.8.17.tar.xz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	43da5163ba106e87d22d2e7d6d67537f	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	56d268cae832738430a9de86a5765fa1	gnome2-utils	588052cacdf74572e68bdfeaece20534	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=a3027fc7c9566f7b32538fef0fd8004f
diff --git a/metadata/md5-cache/x11-libs/libqxt-0.6.2-r2 b/metadata/md5-cache/x11-libs/libqxt-0.6.2-r2
index 660f2b5e6227..a1347d6ad113 100644
--- a/metadata/md5-cache/x11-libs/libqxt-0.6.2-r2
+++ b/metadata/md5-cache/x11-libs/libqxt-0.6.2-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=dev-qt/qtcore:4[ssl] || ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 ) x11-libs/libXrandr berkdb? ( >=sys-libs/db-4.6 ) sql? ( dev-qt/qtsql:4 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) doc? ( dev-qt/qthelp:4 )
+DEPEND=dev-qt/designer:4 dev-qt/qtcore:4[ssl] dev-qt/qtgui:4 x11-libs/libXrandr berkdb? ( >=sys-libs/db-4.6 ) sql? ( dev-qt/qtsql:4 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) doc? ( dev-qt/qthelp:4 )
 DESCRIPTION=The Qt eXTension library provides cross-platform utility classes for the Qt toolkit
 EAPI=5
 HOMEPAGE=http://libqxt.org/
 IUSE=berkdb debug doc sql web xscreensaver zeroconf
 KEYWORDS=amd64 ~arm x86
 LICENSE=|| ( CPL-1.0 LGPL-2.1 )
-RDEPEND=dev-qt/qtcore:4[ssl] || ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 ) x11-libs/libXrandr berkdb? ( >=sys-libs/db-4.6 ) sql? ( dev-qt/qtsql:4 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) xscreensaver? ( x11-libs/libXScrnSaver )
+RDEPEND=dev-qt/designer:4 dev-qt/qtcore:4[ssl] dev-qt/qtgui:4 x11-libs/libXrandr berkdb? ( >=sys-libs/db-4.6 ) sql? ( dev-qt/qtsql:4 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) xscreensaver? ( x11-libs/libXScrnSaver )
 SLOT=0
 SRC_URI=http://dev.libqxt.org/libqxt/get/v0.6.2.tar.bz2 -> libqxt-0.6.2.tar.bz2
 _eclasses_=base	84d9f879f57a8316ff02be0373a3d6f9	eutils	43da5163ba106e87d22d2e7d6d67537f	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	qmake-utils	05b63bb5c708c5903a9de5c58c8e43c8	qt4-r2	cb2cb5856695b300266b425da70e82d8	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=943ed50ec0d69b4cd07e0f0227c46d67
+_md5_=4e068d7f18fd6c7fdecfbd37da666f30
diff --git a/metadata/md5-cache/x11-wm/blackbox-0.70.1-r1 b/metadata/md5-cache/x11-wm/blackbox-0.70.1-r1
index 42bc4b18401d..0148aca2922a 100644
--- a/metadata/md5-cache/x11-wm/blackbox-0.70.1-r1
+++ b/metadata/md5-cache/x11-wm/blackbox-0.70.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A small, fast, full-featured window manager for X
 EAPI=5
 HOMEPAGE=http://blackboxwm.sourceforge.net/
 IUSE=nls truetype debug
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=x11-libs/libXft x11-libs/libXt nls? ( sys-devel/gettext ) truetype? ( media-libs/freetype )
 SLOT=0
 SRC_URI=mirror://sourceforge/blackboxwm/blackbox-0.70.1.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	43da5163ba106e87d22d2e7d6d67537f	libtool	7f78cd7d403808a350c9ae23f5821fb4	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	7a212e5e01adfa4805c9978366e6ee85
-_md5_=148678c044cb7aa2d837cde759b97dd0
+_md5_=10368784d1d43900972bcc48d26dfde4
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 47733834f5e7..381784b59a3f 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Oct 2015 13:11:16 +0000
+Sun, 18 Oct 2015 20:11:30 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 56b20d1fa455..8a7cd964c2d7 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Oct 18 13:11:16 UTC 2015
+Sun Oct 18 20:11:29 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 488ee30b2186..927a38bd55a6 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 18 Oct 2015 13:30:01 +0000
+Sun, 18 Oct 2015 20:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index af20f7f24b8b..8a046576b185 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1445173801 Sun 18 Oct 2015 01:10:01 PM UTC
+1445199001 Sun 18 Oct 2015 08:10:01 PM UTC
diff --git a/net-analyzer/w3af/w3af-1.1-r1.ebuild b/net-analyzer/w3af/w3af-1.1-r1.ebuild
index 853e8b85108e..227d54b653d3 100644
--- a/net-analyzer/w3af/w3af-1.1-r1.ebuild
+++ b/net-analyzer/w3af/w3af-1.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc gtk"
 
 RDEPEND="
diff --git a/net-dns/bind-tools/bind-tools-9.10.3.ebuild b/net-dns/bind-tools/bind-tools-9.10.3.ebuild
index 38b606209061..fb904017e488 100644
--- a/net-dns/bind-tools/bind-tools-9.10.3.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.10.3.ebuild
@@ -52,6 +52,8 @@ src_prepare() {
 	# bug #220361
 	rm aclocal.m4
 	rm -rf libtool.m4/
+
+	mv configure.in configure.ac || die # configure.in is deprecated
 	eautoreconf
 }
 
diff --git a/net-misc/asterisk/asterisk-11.19.0-r2.ebuild b/net-misc/asterisk/asterisk-11.19.0-r2.ebuild
new file mode 100644
index 000000000000..a838a5524412
--- /dev/null
+++ b/net-misc/asterisk/asterisk-11.19.0-r2.ebuild
@@ -0,0 +1,325 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools base eutils linux-info multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+	 mirror://gentoo/gentoo-asterisk-patchset-3.16.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+CDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/libxml2
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	sys-libs/ncurses
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	xmpp? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua:* )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${CDEPEND}
+	!net-libs/openh323
+	!net-libs/pjsip
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa			chan_alsa
+	use_select bluetooth		chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster		res_corosync
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdibarge app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_motif
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select xmpp			res_xmpp
+	use_select ilbc                 codec_ilbc format_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup		app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown root:root $conffile
+			chmod 0644 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 11 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+11"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}
diff --git a/net-misc/asterisk/asterisk-13.5.0-r2.ebuild b/net-misc/asterisk/asterisk-13.5.0-r2.ebuild
new file mode 100644
index 000000000000..20e43bb11d2e
--- /dev/null
+++ b/net-misc/asterisk/asterisk-13.5.0-r2.ebuild
@@ -0,0 +1,326 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools base eutils linux-info multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+	 mirror://gentoo/gentoo-asterisk-patchset-4.02.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+CDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/jansson
+	dev-libs/libxml2
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	sys-libs/ncurses
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	xmpp? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua:* )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${CDEPEND}
+	!net-libs/openh323
+	!net-libs/pjsip
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=autoconf eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa			chan_alsa
+	use_select bluetooth		chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster		res_corosync
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdibarge app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_motif
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select xmpp			res_xmpp
+	use_select ilbc                 codec_ilbc format_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup		app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown root:root $conffile
+			chmod 0644 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd7 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# install the upgrade documentation
+	#
+	dodoc README UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 13 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+13"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}
diff --git a/net-p2p/i2p/files/i2p-0.9.22_fix-paths.patch b/net-p2p/i2p/files/i2p-0.9.22_fix-paths.patch
index d1c207f10e96..e189016be081 100644
--- a/net-p2p/i2p/files/i2p-0.9.22_fix-paths.patch
+++ b/net-p2p/i2p/files/i2p-0.9.22_fix-paths.patch
@@ -61,17 +61,18 @@
  
  # Having IPv6 enabled can cause problems with certain configurations. Changing the
  # next value to true may help. 
---- wrapper.config	2015-03-15 02:02:29.022408661 -0700
-+++ wrapper.config	2015-03-15 02:21:50.666238909 -0700
-@@ -60,13 +60,17 @@
+--- wrapper.config.orig	2015-10-18 13:31:29.410486000 +0000
++++ wrapper.config	2015-10-18 13:48:05.823486000 +0000
+@@ -60,13 +60,18 @@
  # classes, or all the classes of i2p.jar, are in a different directory).
  # Be sure there are no other duplicate classes.
  #
 -wrapper.java.classpath.1=$INSTALL_PATH/lib/*.jar
 +wrapper.java.classpath.1=/usr/share/i2p/lib/*.jar
-+wrapper.java.classpath.2=/usr/share/jakarta-jstl/lib/*.jar
-+wrapper.java.classpath.3=/usr/share/java-service-wrapper/lib/*.jar
-+wrapper.java.classpath.4=/usr/share/bcprov/lib/*.jar
++wrapper.java.classpath.2=/usr/share/tomcat-jstl-impl/lib/*.jar
++wrapper.java.classpath.3=/usr/share/tomcat-jstl-spec/lib/*.jar
++wrapper.java.classpath.4=/usr/share/java-service-wrapper/lib/*.jar
++wrapper.java.classpath.5=/usr/share/bcprov-1.50/lib/*.jar
  #  uncomment this to use the system classpath as well (e.g. to get tools.jar)
  # wrapper.java.classpath.2=%CLASSPATH%
  
@@ -84,54 +85,12 @@
  
  # Java Bits.  On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
  wrapper.java.additional.auto_bits=TRUE
-@@ -76,7 +80,7 @@
+@@ -74,7 +79,7 @@
+ # Java Additional Parameters
+ # Numbers must be consecutive (except for stripquotes)
  wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
- wrapper.java.additional.2=-Dorg.mortbay.http.Version.paranoid=true
- wrapper.java.additional.3=-Dorg.mortbay.xml.XmlParser.NotValidating=true
--wrapper.java.additional.4=-Di2p.dir.base="$INSTALL_PATH"
-+wrapper.java.additional.4=-Di2p.dir.base="/usr/share/i2p"
- wrapper.java.additional.4.stripquotes=TRUE
+-wrapper.java.additional.2=-Di2p.dir.base="$INSTALL_PATH"
++wrapper.java.additional.2=-Di2p.dir.base="/usr/share/i2p"
+ wrapper.java.additional.2.stripquotes=TRUE
  
- # On some IPv6 enabled systems, I2P and other network-enabled java applications
-@@ -96,11 +100,11 @@
- # wrapper.java.additional.7=-Dorg.mortbay.util.FileResource.checkAliases=false
- # PORTABLE installation:
- # uncomment the following
--#wrapper.java.additional.7=-Di2p.dir.pid="$INSTALL_PATH"
-+#wrapper.java.additional.7=-Di2p.dir.pid="/usr/share/i2p"
- #wrapper.java.additional.7.stripquotes=TRUE
--#wrapper.java.additional.8=-Di2p.dir.temp="$INSTALL_PATH"
-+#wrapper.java.additional.8=-Di2p.dir.temp="/usr/share/i2p"
- #wrapper.java.additional.8.stripquotes=TRUE
--#wrapper.java.additional.9=-Di2p.dir.config="$INSTALL_PATH"
-+#wrapper.java.additional.9=-Di2p.dir.config="/usr/share/i2p"
- #wrapper.java.additional.9.stripquotes=TRUE
- #
- # Uncomment this for better performance.
-@@ -147,7 +151,7 @@
- # PORTABLE installation:
- # Use the following instead. I2P will find the logfile here,
- # no need for a wrapper.java.additional line too.
--#wrapper.logfile=$INSTALL_PATH/wrapper.log
-+#wrapper.logfile=/usr/share/i2p/wrapper.log
- 
- # Format of output for the log file.
- # The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread,
-@@ -220,7 +224,7 @@
- #wrapper.java.pidfile=$SYSTEM_java_io_tmpdir/routerjvm.pid
- # PORTABLE installation:
- # Use the following instead.
--#wrapper.java.pidfile=$INSTALL_PATH/routerjvm.pid
-+#wrapper.java.pidfile=/usr/share/i2p/routerjvm.pid
- # pid file for the service monitoring the JVM
- #
- # From i2prouter:
-@@ -238,7 +242,7 @@
- #wrapper.pidfile=$SYSTEM_java_io_tmpdir/i2p.pid
- # PORTABLE installation:
- # Use the following instead.
--#wrapper.pidfile=$INSTALL_PATH/i2p.pid
-+#wrapper.pidfile=/usr/share/i2p/i2p.pid
- 
- #********************************************************************
- # Wrapper General Properties
+ # Prevent the JVM from exporting stats (and thereby causing hundreds of
diff --git a/net-p2p/i2p/i2p-0.9.22-r1.ebuild b/net-p2p/i2p/i2p-0.9.22-r1.ebuild
new file mode 100644
index 000000000000..879f6320e1ce
--- /dev/null
+++ b/net-p2p/i2p/i2p-0.9.22-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils java-pkg-2 java-ant-2 systemd user
+
+DESCRIPTION="A privacy-centric, anonymous network."
+HOMEPAGE="https://geti2p.net"
+SRC_URI="https://download.i2p2.de/releases/${PV}/i2psource_${PV}.tar.bz2"
+
+LICENSE="Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0 EPL-1.0 GPL-2 GPL-3 LGPL-2.1 LGPL-3 MIT public-domain WTFPL-2"
+SLOT="0"
+
+# Until the deps reach other arches
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+# dev-java/ant-core is automatically added due to java-ant-2.eclass
+CDEPEND="dev-java/jrobin:0
+	dev-java/slf4j-api:0
+	dev-java/java-service-wrapper:0"
+
+DEPEND="${CDEPEND}
+	dev-java/eclipse-ecj:*
+	dev-libs/gmp:*
+	nls? ( sys-devel/gettext )
+	>=virtual/jdk-1.6"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+EANT_BUILD_TARGET="pkg"
+EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api"
+
+pkg_setup() {
+	enewgroup i2p
+	enewuser i2p -1 -1 /var/lib/i2p i2p -m
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	java-ant_rewrite-classpath
+}
+
+src_prepare() {
+	# We're on GNU/Linux, we don't need .exe files
+	echo "noExe=true" > override.properties
+	if ! use nls; then
+		echo "require.gettext=false" >> override.properties
+	fi
+}
+
+src_install() {
+	# Cd into pkg-temp.
+	cd "${S}/pkg-temp" || die
+
+	# Apply patch.
+	epatch "${FILESDIR}/${P}_fix-paths.patch"
+
+	# Using ${D} here results in an error. Docs say use $ROOT
+	i2p_home="${ROOT}/usr/share/i2p"
+
+	# This is ugly, but to satisfy all non-system .jar dependencies, jetty and
+	# systray4j would need to be packaged. The former would be too large a task
+	# for an unseasoned developer and systray4j hasn't been touched in over 10
+	# years. This seems to be the most pragmatic solution
+	java-pkg_jarinto "${i2p_home}/lib"
+	for i in BOB commons-el commons-logging i2p i2psnark i2ptunnel \
+		jasper-compiler jasper-runtime javax.servlet jbigi jetty* mstreaming org.mortbay.* router* \
+		sam standard streaming systray systray4j; do
+		java-pkg_dojar lib/${i}.jar
+	done
+
+	# Set up symlinks for binaries
+	dosym /usr/bin/wrapper ${i2p_home}/i2psvc
+	dosym ${i2p_home}/i2prouter /usr/bin/i2prouter
+	dosym ${i2p_home}/eepget /usr/bin/eepget
+
+	# Install main files and basic documentation
+	exeinto ${i2p_home}
+	insinto ${i2p_home}
+	#doins blocklist.txt hosts.txt *.config
+	doexe eepget i2prouter runplain.sh
+	dodoc history.txt INSTALL-headless.txt LICENSE.txt
+	doman man/*
+
+	# Install other directories
+	doins -r certificates docs eepsite geoip scripts
+	dodoc -r licenses
+	java-pkg_dowar webapps/*.war
+
+	# Install daemon files
+	newinitd "${FILESDIR}/i2p.initd" i2p
+	systemd_newunit "${FILESDIR}"/i2p.service i2p.service
+}
+
+pkg_postinst() {
+	elog "Custom configuration belongs in /var/lib/i2p/.i2p/ to avoid being overwritten."
+	elog "I2P can be configured through the web interface at http://localhost:7657/index.jsp"
+}
diff --git a/net-p2p/i2p/i2p-0.9.22.ebuild b/net-p2p/i2p/i2p-0.9.22.ebuild
index 879f6320e1ce..d5c00b67c5fb 100644
--- a/net-p2p/i2p/i2p-0.9.22.ebuild
+++ b/net-p2p/i2p/i2p-0.9.22.ebuild
@@ -19,7 +19,10 @@ IUSE="nls"
 
 # dev-java/ant-core is automatically added due to java-ant-2.eclass
 CDEPEND="dev-java/jrobin:0
+	dev-java/bcprov:1.50
 	dev-java/slf4j-api:0
+	dev-java/tomcat-jstl-impl:0
+	dev-java/tomcat-jstl-spec:0
 	dev-java/java-service-wrapper:0"
 
 DEPEND="${CDEPEND}
@@ -32,7 +35,7 @@ RDEPEND="${CDEPEND}
 	>=virtual/jre-1.6"
 
 EANT_BUILD_TARGET="pkg"
-EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api"
+EANT_GENTOO_CLASSPATH="java-service-wrapper,jrobin,slf4j-api,tomcat-jstl-impl,tomcat-jstl-spec"
 
 pkg_setup() {
 	enewgroup i2p
diff --git a/net-p2p/pybitmessage/Manifest b/net-p2p/pybitmessage/Manifest
index 0d802d1d946a..6107159e6b5c 100644
--- a/net-p2p/pybitmessage/Manifest
+++ b/net-p2p/pybitmessage/Manifest
@@ -1,2 +1,3 @@
 DIST pybitmessage-0.4.2.tar.gz 547565 SHA256 c69cef72adbdfa2a0ff8c5c7e5d15e640bf3283b9089c388ea48e893d564a573 SHA512 5e783243db4f507ec221092f6da18d25bb15a8c83f28aab7c1796a063d2608c0115c9d636cc73b66a09264a4ff69dda9ba373eff81640b1dd9595100dcdc4917 WHIRLPOOL 22c1ca5e5132248dc8492bd1ea327e81b8567b0ec271c774a07141579a63365dd4cc7fbd066dbba6153ce471057cead1f0763b4ae209789991b7c3b2cb5ebaa4
 DIST pybitmessage-0.4.3.tar.gz 605581 SHA256 0a0825b554aef4e6eba3e4c4eb89e03ee86bda6f3068a69f4314f26ad24a6e5d SHA512 d7d5db360e3fef88f9d9168464f6256fb44e207afabd2f9c31d85c264eab0b8a9d89f7e52aca1190f854beaf7b5ee48bd05c079cd31b775fa84b6e10612e8cee WHIRLPOOL cbe800ca83ffc213f8335a97aa6d534b41a968c76fcdff59a245694a84312e27f926b2e143bfb904036917c91bce7a27a5cfbbc83aa19005f3a41109c3efd53a
+DIST pybitmessage-0.4.4.tar.gz 611490 SHA256 2fe2b1ad4d7426c8777fb429129b7a07c717ea5f00cc3041a03ac19fd3259b3a SHA512 977d901525864557fcb6deada27d45a0cc90a40090f9f70f7a1cf27ffcc93ab69ef3d369375414988c519211b6d19a1ad7a0e9b38eec26f3fea02b386c652711 WHIRLPOOL d3da00d5b1bfe5ae9361a78d8a251567d2a06cd7009da9f1af58e0d06f3d2830f0133fc559b16cd10620cc5933292027bebc6f20abe026f5a63e6cfc1057bc28
diff --git a/net-p2p/pybitmessage/metadata.xml b/net-p2p/pybitmessage/metadata.xml
index ada6833f13e3..e6bddbfa47ce 100644
--- a/net-p2p/pybitmessage/metadata.xml
+++ b/net-p2p/pybitmessage/metadata.xml
@@ -2,7 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
 	</maintainer>
 	<longdescription lang="en">
 		Bitmessage is a P2P communications protocol used to send encrypted
diff --git a/net-p2p/pybitmessage/pybitmessage-0.4.4.ebuild b/net-p2p/pybitmessage/pybitmessage-0.4.4.ebuild
new file mode 100644
index 000000000000..782c2ced4640
--- /dev/null
+++ b/net-p2p/pybitmessage/pybitmessage-0.4.4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils python-r1 gnome2-utils
+
+DESCRIPTION="P2P communications protocol"
+HOMEPAGE="https://bitmessage.org"
+SRC_URI="https://github.com/Bitmessage/PyBitmessage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	!libressl? ( dev-libs/openssl:0[-bindist] )
+	libressl? ( dev-libs/libressl )
+	dev-python/PyQt4[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/PyBitmessage-${PV}
+
+src_compile() { :; }
+
+src_install () {
+	cat >> "${T}"/${PN}-wrapper <<-EOF || die
+	#!/usr/bin/env python
+	import os
+	import sys
+	sys.path.append("@SITEDIR@")
+	os.chdir("@SITEDIR@")
+	os.execl('@PYTHON@', '@EPYTHON@', '@SITEDIR@/bitmessagemain.py')
+	EOF
+
+	touch src/__init__.py || die
+
+	install_python() {
+		local python_moduleroot=${PN}
+		python_domodule src/*
+		sed \
+			-e "s#@SITEDIR@#$(python_get_sitedir)/${PN}#" \
+			-e "s#@EPYTHON@#${EPYTHON}#" \
+			-e "s#@PYTHON@#${PYTHON}#" \
+			"${T}"/${PN}-wrapper > ${PN} || die
+		python_doscript ${PN}
+	}
+
+	python_foreach_impl install_python
+
+	dodoc README.md debian/changelog
+	doman man/*
+
+	newicon -s 24 desktop/icon24.png ${PN}.png
+	newicon -s scalable desktop/can-icon.svg ${PN}.svg
+	domenu desktop/${PN}.desktop
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-p2p/pybitmessage/pybitmessage-9999.ebuild b/net-p2p/pybitmessage/pybitmessage-9999.ebuild
index bcb8143731f5..b994ca0be33f 100644
--- a/net-p2p/pybitmessage/pybitmessage-9999.ebuild
+++ b/net-p2p/pybitmessage/pybitmessage-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
 
-inherit eutils python-r1 gnome2-utils git-2
+inherit eutils python-r1 gnome2-utils git-r3
 
 DESCRIPTION="P2P communications protocol"
 HOMEPAGE="https://bitmessage.org"
@@ -28,7 +28,7 @@ RDEPEND="${DEPEND}
 src_compile() { :; }
 
 src_install () {
-	cat >> "${T}"/${PN}-wrapper <<-EOF
+	cat >> "${T}"/${PN}-wrapper <<-EOF || die
 	#!/usr/bin/env python
 	import os
 	import sys
@@ -52,12 +52,12 @@ src_install () {
 
 	python_foreach_impl install_python
 
-	nonfatal dodoc README.md debian/changelog
-	nonfatal doman man/*
+	dodoc README.md debian/changelog
+	doman man/*
 
-	nonfatal newicon -s 24 desktop/icon24.png ${PN}.png
-	nonfatal newicon -s scalable desktop/can-icon.svg ${PN}.svg
-	nonfatal domenu desktop/${PN}.desktop
+	newicon -s 24 desktop/icon24.png ${PN}.png
+	newicon -s scalable desktop/can-icon.svg ${PN}.svg
+	domenu desktop/${PN}.desktop
 }
 
 pkg_preinst() {
diff --git a/net-p2p/transmission/transmission-2.84-r3.ebuild b/net-p2p/transmission/transmission-2.84-r3.ebuild
index 53430d58c4b3..4c99f388d0ec 100644
--- a/net-p2p/transmission/transmission-2.84-r3.ebuild
+++ b/net-p2p/transmission/transmission-2.84-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.xz"
 LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
 SLOT=0
 IUSE="ayatana gtk lightweight systemd qt4 qt5 xfs"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="amd64 ~arm ~mips ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux"
 
 RDEPEND=">=dev-libs/libevent-2.0.10:=
 	dev-libs/openssl:0=
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index cb9442092da4..301c82e6ae65 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2164,6 +2164,8 @@ dev-ml/lwt:toplevel - Enables enhanced toplevel.
 dev-ml/ocaml-cstruct:async - Support for asynchronous execution
 dev-ml/ocaml-cstruct:camlp4 - Enable support for camlp4
 dev-ml/ocaml-cstruct:lwt - Enable threads via lwt
+dev-ml/ocaml-dns:async - support for asynchronous execution
+dev-ml/ocaml-dns:lwt - enable threads via lwt
 dev-ml/ocaml-uri:allservices - Compile support for all service types
 dev-ml/ocamlnet:cryptokit - Enables encryption support via dev-ml/cryptokit
 dev-ml/ocamlnet:httpd - Enables net-httpd web server component
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.32.108.8.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.32.108.8.ebuild
index d145a19a1616..d77ef2b08d1e 100644
--- a/sys-kernel/openvz-sources/openvz-sources-2.6.32.108.8.ebuild
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.32.108.8.ebuild
@@ -31,7 +31,7 @@ K_DEBLOB_AVAILABLE=0
 inherit kernel-2
 #detect_version
 
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc64 ~sparc x86"
 IUSE=""
 
 DESCRIPTION="Kernel sources with OpenVZ patchset"
diff --git a/sys-libs/uclibc/metadata.xml b/sys-libs/uclibc/metadata.xml
index e4cf5b884b75..c616c63b7eff 100644
--- a/sys-libs/uclibc/metadata.xml
+++ b/sys-libs/uclibc/metadata.xml
@@ -6,6 +6,10 @@
     <email>vapier@gentoo.org</email>
     <description>Primary Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>blueness@gentoo.org</email>
+    <name>Anthony G. Basile</name>
+  </maintainer>
   <longdescription>
 uClibc pronounced yew-see-lib-see is a C library for developing embedded Linux 
 systems. It is much smaller than the GNU C Library, but nearly all applications supported 
diff --git a/www-apps/dokuwiki/dokuwiki-20140929d-r1.ebuild b/www-apps/dokuwiki/dokuwiki-20140929d-r1.ebuild
index 7a54790f3106..306dc8e6369d 100644
--- a/www-apps/dokuwiki/dokuwiki-20140929d-r1.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20140929d-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
 SRC_URI="http://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="gd"
 
 DEPEND=""
diff --git a/x11-libs/goffice/goffice-0.8.17-r2.ebuild b/x11-libs/goffice/goffice-0.8.17-r2.ebuild
new file mode 100644
index 000000000000..e09db3fe77f6
--- /dev/null
+++ b/x11-libs/goffice/goffice-0.8.17-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="A library of document-centric objects and utilities"
+HOMEPAGE="https://git.gnome.org/browse/goffice/"
+
+LICENSE="GPL-2"
+SLOT="0.8"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="gnome"
+
+# Build fails with -gtk
+# FIXME: add lasem to tree
+RDEPEND="
+	>=dev-libs/glib-2.16:2
+	>=gnome-extra/libgsf-1.14.9
+	>=dev-libs/libxml2-2.4.12:2
+	>=x11-libs/pango-1.8.1
+	>=x11-libs/cairo-1.2[svg]
+	x11-libs/libXext
+	x11-libs/libXrender
+	>=x11-libs/gtk+-2.16:2
+	gnome? ( >=gnome-base/gconf-2:2 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=dev-util/intltool-0.35
+	dev-util/gtk-doc-am
+
+	gnome-base/gnome-common
+"
+# eautoreconf requires: gnome-common
+
+src_prepare() {
+	# bug #404271, https://bugzilla.gnome.org/show_bug.cgi?id=670316
+	epatch "${FILESDIR}/${P}-no-pcre.patch"
+
+	mv configure.in configure.ac || die
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf
+	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
+
+	# Gsettings is still experimental
+	if use gnome; then
+		myconf="${myconf} --with-config-backend=gconf"
+	else
+		myconf="${myconf} --with-config-backend=keyfile"
+	fi
+
+	gnome2_src_configure \
+		--without-lasem \
+		--with-gtk \
+		${myconf}
+}
diff --git a/x11-libs/libqxt/libqxt-0.6.2-r2.ebuild b/x11-libs/libqxt/libqxt-0.6.2-r2.ebuild
index bdebee63532e..e4aabdf1ab46 100644
--- a/x11-libs/libqxt/libqxt-0.6.2-r2.ebuild
+++ b/x11-libs/libqxt/libqxt-0.6.2-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-inherit multilib qt4-r2
+inherit multilib qmake-utils qt4-r2
 
 DESCRIPTION="The Qt eXTension library provides cross-platform utility classes for the Qt toolkit"
 HOMEPAGE="http://libqxt.org/"
@@ -16,11 +16,9 @@ KEYWORDS="amd64 ~arm x86"
 IUSE="berkdb debug doc sql web xscreensaver zeroconf"
 
 COMMON_DEPEND="
+	dev-qt/designer:4
 	dev-qt/qtcore:4[ssl]
-	|| (
-		( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 )
-		<dev-qt/qtgui-4.8.5:4
-	)
+	dev-qt/qtgui:4
 	x11-libs/libXrandr
 	berkdb? ( >=sys-libs/db-4.6 )
 	sql? ( dev-qt/qtsql:4 )
@@ -57,7 +55,7 @@ src_configure() {
 		-prefix "${EPREFIX}/usr"
 		-libdir "${EPREFIX}/usr/$(get_libdir)"
 		-docdir "${EPREFIX}/usr/share/doc/${PF}"
-		-qmake-bin "${EPREFIX}/usr/bin/qmake"
+		-qmake-bin "${EPREFIX}/$(qt4_get_bindir)/qmake"
 		$(use debug && echo -debug || echo -release)
 		$(use berkdb || echo -no-db -nomake berkeley)
 		$(use doc || echo -nomake docs)
diff --git a/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild b/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
index 5a1ab87f0ac7..7a08527a6c07 100644
--- a/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
+++ b/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}wm/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="nls truetype debug"
 
 RDEPEND="x11-libs/libXft