diff --git a/app-crypt/gnupg/gnupg-1.4.21.ebuild b/app-crypt/gnupg/gnupg-1.4.21.ebuild
index d47c1010dd03..a168d6b8f00c 100644
--- a/app-crypt/gnupg/gnupg-1.4.21.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.21.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="bzip2 curl ldap mta nls readline selinux smartcard static usb zlib"
 
 COMMON_DEPEND="
diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest
index 6a04d99d22f2..343c26896e8e 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,2 +1,3 @@
 DIST cloud-init-0.7.6.tar.gz 515670 SHA256 9e8fd22eb7f6e40ae6a5f66173ddc3cc18f65ee406c460a728092b37db2f3ed7 SHA512 aa2397328afda8e77ed6d642e7642f41a4b4b5bcd3d0e87056aa8c88b56624ec65c57cfc66b0d13ccc235f1840baf1d577316974902a0439cf2f2eb0f8eef36d WHIRLPOOL 639a556e51b4b4b180951f9e481f9a0dcd45067d1d5760ce7e871ceea8bbb4e195258d96273d3ef88c7e2f2520318e9172c3ad0cb23d6ad0ae1835e17087e3a5
 DIST cloud-init-0.7.6_p1212.tar.gz 451717 SHA256 d213ee72a62cef5ef63369737a52c0ce0c2034ca1ae230925b6679f4335e685d SHA512 25c5d1cc7c8fa887859624b4f28416d455063c278e3f00bfb3561ab0c99aa708d9fa431ff17c42994aba43eb985538982e5175bf0531857cc18fd8e724ef1fd3 WHIRLPOOL d6608c750370fd470d6aae0e88125e9e56b424c40a5b1131b610cb675808b1f7e0657169273db29c4e994d3dce12f6076566eccbac6deee8c4277ffd33ceae38
+DIST cloud-init-0.7.7.tar.gz 477287 SHA256 d7b75e314ecdb99619014f21f3b622294a6c3bde248887dfb5e9cedb927ad0b0 SHA512 06cd2bba67da9668204416073af771145668db43777d6f183dcb54e8e1d9d12471fe3bfc99dfbc03a81814c5614347ff7d6acc5dbe117e1206d7fc2041ae4b62 WHIRLPOOL 9fccfba02aacc138dc62a6be9547fa1e5bd6959a96eef9b7f6f1ac86112049b36751882d954ac0e8d7aa5bf9580c5e27ec9abfdc2ef542628af448c00c468a09
diff --git a/app-emulation/cloud-init/cloud-init-0.7.7.ebuild b/app-emulation/cloud-init/cloud-init-0.7.7.ebuild
new file mode 100644
index 000000000000..1453bb7303fc
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-0.7.7.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1 eutils multilib systemd
+
+DESCRIPTION="cloud initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init"
+# Launchpad does not provide consistent checksums https://bugs.launchpad.net/launchpad/+bug/1576338
+# SRC_URI="http://bazaar.launchpad.net/~${PN}-dev/${PN}/trunk/tarball/${PV/*_p} -> ${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz http://dev.gentoo.org/~prometheanfire/dist/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	dev-python/oauthlib[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${CDEPEND}
+		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-python/pep8[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/hacking[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	sys-apps/iproute2
+	sys-fs/growpart
+	virtual/logger
+"
+
+PATCHES=( "${FILESDIR}/cloud-init-0.7.7-gentooinit.patch" )
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	emake test
+}
+
+python_install() {
+	distutils-r1_python_install "--init-system=sysvinit_openrc"
+}
+
+python_install_all() {
+	keepdir /etc/cloud
+
+	distutils-r1_python_install_all
+
+	chmod +x "${D}"/etc/init.d/cloud-config
+	chmod +x "${D}"/etc/init.d/cloud-final
+	chmod +x "${D}"/etc/init.d/cloud-init
+	chmod +x "${D}"/etc/init.d/cloud-init-local
+
+	insinto /etc/cloud/templates
+	doins "${FILESDIR}/hosts.gentoo.tmpl"
+	insinto /etc/cloud
+	doins "${FILESDIR}/cloud.cfg"
+
+	systemd_dounit "${S}"/systemd/cloud-config.service
+	systemd_dounit "${S}"/systemd/cloud-config.target
+	systemd_dounit "${S}"/systemd/cloud-final.service
+	systemd_dounit "${S}"/systemd/cloud-init-local.service
+	systemd_dounit "${S}"/systemd/cloud-init.service
+}
diff --git a/app-emulation/cloud-init/files/cloud-init-0.7.7-gentooinit.patch b/app-emulation/cloud-init/files/cloud-init-0.7.7-gentooinit.patch
new file mode 100644
index 000000000000..ddb4f38201cc
--- /dev/null
+++ b/app-emulation/cloud-init/files/cloud-init-0.7.7-gentooinit.patch
@@ -0,0 +1,42 @@
+diff --git a/cloudinit/sources/DataSourceOpenNebula.py b/cloudinit/sources/DataSourceOpenNebula.py
+index 7b3a76b..635a836 100644
+--- a/cloudinit/sources/DataSourceOpenNebula.py
++++ b/cloudinit/sources/DataSourceOpenNebula.py
+@@ -407,7 +407,7 @@ def read_context_disk_dir(source_dir, asuser=None):
+     # http://opennebula.org/documentation:rel3.8:cong#network_configuration
+     for k in context:
+         if re.match(r'^ETH\d+_IP$', k):
+-            (out, _) = util.subp(['/sbin/ip', 'link'])
++            (out, _) = util.subp(['ip', 'link'])
+             net = OpenNebulaNetwork(out, context)
+             results['network-interfaces'] = net.gen_conf()
+             break
+diff --git a/setup.py b/setup.py
+index bbadd7b..1578a3d 100755
+--- a/setup.py
++++ b/setup.py
+@@ -74,6 +74,7 @@ INITSYS_FILES = {
+     'sysvinit': [f for f in glob('sysvinit/redhat/*') if is_f(f)],
+     'sysvinit_freebsd': [f for f in glob('sysvinit/freebsd/*') if is_f(f)],
+     'sysvinit_deb': [f for f in glob('sysvinit/debian/*') if is_f(f)],
++    'sysvinit_openrc': [f for f in glob('sysvinit/gentoo/*') if is_f(f)],
+     'systemd': [f for f in (glob('systemd/*.service') +
+                             glob('systemd/*.target')) if is_f(f)],
+     'systemd.generators': [f for f in glob('systemd/*-generator') if is_f(f)],
+@@ -83,6 +84,7 @@ INITSYS_ROOTS = {
+     'sysvinit': '/etc/rc.d/init.d',
+     'sysvinit_freebsd': '/usr/local/etc/rc.d',
+     'sysvinit_deb': '/etc/init.d',
++    'sysvinit_openrc': '/etc/init.d',
+     'systemd': pkg_config_read('systemd', 'systemdsystemunitdir'),
+     'systemd.generators': pkg_config_read('systemd',
+                                           'systemdsystemgeneratordir'),
+@@ -205,7 +207,7 @@ setuptools.setup(
+     author='Scott Moser',
+     author_email='scott.moser@canonical.com',
+     url='http://launchpad.net/cloud-init/',
+-    packages=setuptools.find_packages(exclude=['tests']),
++    packages=setuptools.find_packages(exclude=['tests.*', 'tests']),
+     scripts=['tools/cloud-init-per'],
+     license='GPLv3',
+     data_files=data_files,
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index 9412688a229a..83497b264898 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -1 +1,2 @@
+DIST byobu_5.111.orig.tar.gz 664384 SHA256 b28c93f72cd9a62e1b1aa11abc8d8863f06c43da2c7089f6529683bbf13a50fc SHA512 f4b20fd3ac01b4361a9ea02428326c3920a8bf728b03c309d491413daf603b3b2807ab1770274034f08299947d66a759777a1b2ddd087d7c9c19c67c7baec48a WHIRLPOOL 32cddcc542137a438bffde637190663d7f56ba44de622110134b79f536b5f33ff3e80a28824d33b12ad792efd27e9bf898ee13e186df7923f46dce29d0a01b44
 DIST byobu_5.94.orig.tar.gz 660103 SHA256 4917013f590110d25b18293a51af02bd1ebcd1c665474f62e2566fb9b8f62916 SHA512 b4e07d7d197f8796c26f33aa08c1d61dab463ce5cd2d646bf32c4c5a4be17ffe2b8996cb305c999ca0be20a1fab81c24dbd0eae5588b74e8da1e7726c293b2e6 WHIRLPOOL d2832c4ecac9d4d6907051d33efb8f51816866ce4bd0d75d5684322dd83a56d0a4717d2b6fd7736a0ca488d5e2e648a0e48a09de6a0bffcd779aa63cefd50c4c
diff --git a/app-misc/byobu/byobu-5.111.ebuild b/app-misc/byobu/byobu-5.111.ebuild
new file mode 100644
index 000000000000..7bd23b5ebffa
--- /dev/null
+++ b/app-misc/byobu/byobu-5.111.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="http://byobu.co"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="screen"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/newt[${PYTHON_USEDEP}]
+	screen? ( app-misc/screen )
+	!screen? ( app-misc/tmux )"
+
+src_prepare() {
+	default
+
+	python_fix_shebang .
+
+	# Set default system backend to screen
+	if use screen ; then
+		sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
+	fi
+}
+
+src_install() {
+	default
+
+	# Create symlinks for backends
+	dosym ${PN} /usr/bin/${PN}-screen
+	dosym ${PN} /usr/bin/${PN}-tmux
+
+	docompress -x /usr/share/doc/${PN}
+}
diff --git a/app-misc/when/Manifest b/app-misc/when/Manifest
index 3bac698d90b7..4503c72a7e41 100644
--- a/app-misc/when/Manifest
+++ b/app-misc/when/Manifest
@@ -1,2 +1,3 @@
 DIST when-1.1.33.tar.gz 49740 SHA256 568a49e999363a018186e03c38d116c587b332f7fcf60820f9cfc34779050ab0 SHA512 5c0934257133f75a7de984499f99f68dde5343d51051acf1b454f04dae82254c733e946a6c5ead546dc3c07cd113d938a48c95af39b80cbfc04ee6d748223c83 WHIRLPOOL 9bcbe73a4034b817fc34d302689a0b404563081163c692ee23e484fbb9ab993a90a5d468f2586e7f5327abad98f4033ebd7546255f682898e899a9fdd7629c97
 DIST when-1.1.35.tar.gz 51308 SHA256 f880c0d80b1023a05df99690e36be133c46071657b9921fc9e8d16115fb13ae6 SHA512 b9acd1e3ea69c3ea9672eb16bd291c79612bbd037b4b96f6350d44da1400729a62bfc320eed2637646a728c243abacd7e26f22e76b5b12006dbd0c70bcb4a7da WHIRLPOOL 04ac240b99c5a0a3a2e0f80e7edd6ab0fd85939676016877f595d5698c8238d754ca4deb697eea507744bb936f64f6011548aa062751d99ffcc47a24362dbf4f
+DIST when-1.1.36.tar.gz 50926 SHA256 3ff95c1881e8fe25c82943720a81c9b9b3bd4ac002cd8ffc2d25c588fe7d50b1 SHA512 04b2efbcebae79325d8410a5aa5cdf59662fe42c06229ebc91f3b7163091d305a6ba91914a2a9117d86807d5ca0c875d48679dbc3545162a7263679bf605a52e WHIRLPOOL 1e7ed8d6e2939eaf898e01acebcd74f340e33eff5af17613e60eed62b756e8dd4df300990194b3cbebec64751c2adc1cb44848f1aad3d0b840bc9fe7174ea144
diff --git a/app-misc/when/when-1.1.36.ebuild b/app-misc/when/when-1.1.36.ebuild
new file mode 100644
index 000000000000..73272c18172e
--- /dev/null
+++ b/app-misc/when/when-1.1.36.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Extremely simple personal calendar program aimed at the Unix geek who wants something minimalistic"
+HOMEPAGE="http://www.lightandmatter.com/when/when.html"
+SRC_URI="http://www.lightandmatter.com/when/when.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/when_dist
+
+src_prepare() {
+	default
+
+	# Fix path for tests
+	sed -i 's,^	when,	./when,' Makefile || die 'sed failed'
+}
+
+src_compile() { :; }
+
+src_test() {
+	# The when command requires these files, or attempts to run setup function.
+	mkdir "${HOME}"/.when || die 'mkdir failed'
+	touch "${HOME}"/.when/{calendar,preferences} || die 'touch failed'
+	emake test
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc README
+}
diff --git a/dev-db/percona-toolkit/Manifest b/dev-db/percona-toolkit/Manifest
index a449b9309599..d09ef88de008 100644
--- a/dev-db/percona-toolkit/Manifest
+++ b/dev-db/percona-toolkit/Manifest
@@ -1,3 +1,3 @@
 DIST percona-toolkit-2.2.11.tar.gz 1389718 SHA256 848a8a57bf04dc1b2cc2ab555dd594a2c708b76656042ff38b1a91b8ccb1df4b SHA512 d5e34fce1b6b69dfc1a8ecd7bcbe84e586e950976553f4fd30afb887a850770c08990216e41fc194bdd0a5642034905ee2d69c2f8b3781503c9b4aab47017cdb WHIRLPOOL 79e02087c97b86e6e282215cf73c89d7d6842978a1d40d3b9e2a484437e6939a9957c7028feb8690ffc8b915c26627c943204f230f4cb09749bb3e22ec4189ff
-DIST percona-toolkit-2.2.15.tar.gz 1401540 SHA256 ad9fffcee66852ac19c5d138e17474ff48af0083bc0fd8d0a6fb9400bab130f3 SHA512 b7035701909c3587ded1438bef7bdaa4ca1f40b339dbce001826aeadff46335ff39023a020c05ebd3e81a9ede70de26a162c48e5852e47577e7c6b3ec49a57c0 WHIRLPOOL 782134712d7562699f6e1f60299852d67e1bb1193c846c4cf48dba666f4fac44da655157bd2d5dafb4ae89db64e371d8e2e875d0397b8d2c3f257302928873d4
 DIST percona-toolkit-2.2.17.tar.gz 1420968 SHA256 5a49c84bd8cf9dceca943f1e2879d0a67b58b73325dc7db725aec81a6a125262 SHA512 a6ac84db9fc77b57fffd4f18b1e6c147fa39821a8b8db128af15bac6884a2937f973aa59adb05b738c3a15d9006c71db49276207c5b321acbefd8bd3a6130b76 WHIRLPOOL f2041c61f0e58c68cad1cb1ddca09aca7f9c0b9bb2ffc81303e80e483211b5fcf59f176d32d9bc324cf1bce6404fe15ad730fda40ad5c9b96c4bc81fc5b9e437
+DIST percona-toolkit-2.2.19.tar.gz 1425623 SHA256 e9f4d4730265813fa7a39ed8799d12ca5775c8e5d6fa27ff48bae11db0f7e671 SHA512 8da35e2ee4d81465131623e5b423c2c49c0bf0faf01862952dd5ca72c2ffea64fabcaf88dda883e633e23de8ae4a6c75a095a751708bac6a8136fc8daaae2383 WHIRLPOOL 7539e661230c321b3ba74b625a67d1e19d3c21676e2e5bbc66d843c1f896df6fc679e406d2703c42b990e7446f490f2fb2cd39298059eb382fbc8af39a46bc31
diff --git a/dev-db/percona-toolkit/files/percona-toolkit-2.2.19-fix-package-name.patch b/dev-db/percona-toolkit/files/percona-toolkit-2.2.19-fix-package-name.patch
new file mode 100644
index 000000000000..283299b14b42
--- /dev/null
+++ b/dev-db/percona-toolkit/files/percona-toolkit-2.2.19-fix-package-name.patch
@@ -0,0 +1,13 @@
+Source https://github.com/percona/percona-toolkit/pull/84
+Adapted to current version
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -1,7 +1,7 @@
+ use ExtUtils::MakeMaker;
+
+ WriteMakefile(
+-    NAME      => 'percona-toolkit',
++    NAME      => 'Percona::Toolkit',
+     VERSION   => '2.2.19',
+     EXE_FILES => [ <bin/*> ],
+     MAN1PODS  => {
diff --git a/dev-db/percona-toolkit/percona-toolkit-2.2.15.ebuild b/dev-db/percona-toolkit/percona-toolkit-2.2.19.ebuild
similarity index 58%
rename from dev-db/percona-toolkit/percona-toolkit-2.2.15.ebuild
rename to dev-db/percona-toolkit/percona-toolkit-2.2.19.ebuild
index f2aba7875e44..267236014f66 100644
--- a/dev-db/percona-toolkit/percona-toolkit-2.2.15.ebuild
+++ b/dev-db/percona-toolkit/percona-toolkit-2.2.19.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit eutils perl-app perl-module toolchain-funcs
+inherit perl-module
 
-DESCRIPTION="essential command-line utilities for MySQL"
-HOMEPAGE="http://www.percona.com/software/percona-toolkit/"
-SRC_URI="http://www.percona.com/downloads/${PN}/${PV}/tarball/${P}.tar.gz"
+DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks"
+HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit"
+SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/tarball/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 Artistic )"
 SLOT="0"
@@ -36,13 +36,10 @@ DEPEND="${COMMON_DEPEND}
 	virtual/perl-ExtUtils-MakeMaker"
 
 src_prepare() {
-	# bug 501904 - CVE-2014-2029
+	# Bug #501904 - CVE-2014-2029
 	# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/*
-	epatch "${FILESDIR}/${PN}-2.2.7-no-versioncheck.patch"
-}
+	eapply -p2 "${FILESDIR}"/${PN}-2.2.7-no-versioncheck.patch
+	eapply -p1 "${FILESDIR}"/${PN}-2.2.19-fix-package-name.patch
 
-# Percona Toolkit does NOT contain the UDF code for Murmur/FNV any more.
-src_install() {
-	perl-module_src_install
-	dodoc docs/percona-toolkit.pod
+	default
 }
diff --git a/dev-db/xtrabackup-bin/Manifest b/dev-db/xtrabackup-bin/Manifest
index 1f688fd177d0..453e4344fca5 100644
--- a/dev-db/xtrabackup-bin/Manifest
+++ b/dev-db/xtrabackup-bin/Manifest
@@ -1,4 +1,2 @@
-DIST percona-xtrabackup-2.2.5-5027-Linux-i686.tar.gz 24942813 SHA256 b904bb8d7bc48b48aaadf1af8a21df9987198f36c23c576e2a2090c9e06eb55a SHA512 16ca7739e43b65f22ac5ab9cc9e0e701d4b0ecbe179ebac70719902000a36cb37de87446b9a2830813fe2714ffdfa7bccb938961951c01804d8e2ec98f6d7c10 WHIRLPOOL 3d565e29ddaf9f21d3c0e85d49f2ba8379ab1c07961561853abdc197bbf3c4c7aa067e9e0da3d5de96569b41834282e2954a02e4d8169ed0030606c3f4169e6c
-DIST percona-xtrabackup-2.2.5-5027-Linux-x86_64.tar.gz 25313698 SHA256 90b5ca03e872581e95aa3e24972212940417d3c64879b28bc37a848f89bba7e9 SHA512 54576cecd24797730ab0b262558424e2716135de88ccc80dfb7716adfcf404fdb2ac2ceec99b436eb1e31392fffdf5eba122e15070cc0f10906aaf5617bada85 WHIRLPOOL 655143c2a75db8a38b9f97a657c3c199bf1054552a5b638ff8c27d3ad76b1d67b1504628077577664711010c8085b3185a754507c0f330e5603e94ebccbf25d2
-DIST percona-xtrabackup-2.4.1-Linux-i686.tar.gz 79585648 SHA256 be80de6c40aa13717566cd4a6c7d8ee26933c0df0656f800e1e88a6d00f8303d SHA512 8aaa8b3490fc975925e061138c62976c0b64a6578cf725b73786fd9ce71065115cc857fd06ebecf771dbbacaca00428fd342498275ac8af0235a1a27b2cb50e3 WHIRLPOOL 51919ec6872687d709d87c2a962c07c76a2fa7f95baa810af473e2869d6d58f79023a944385d0084dda7c51b55949916752672475f4561c0bd8e627395bbf432
-DIST percona-xtrabackup-2.4.1-Linux-x86_64.tar.gz 80754302 SHA256 ba1423df58da1ca21d9db4ea6c3d29886a52af708bfb85859f89d1aaa4135b21 SHA512 38c0229674154eb5e17b3300f9d8a413f7ec548f8357a1ad3309f0353f32a479f59767679d364a76b8ffa5b72bb764bb2d4f162ad5a28993f71b69bd95869a7b WHIRLPOOL ca8994c40d215c9389f8a16f56a5445fc327cc104be56d908dd330b20ff2b8e94ec51ce56b3984771f47d2163b5dd36c62e0e8636a51524c645273a807252401
+DIST percona-xtrabackup-2.4.4-Linux-i686.tar.gz 80913003 SHA256 0f822861fd38b45132f2529fea0d9662407a6f232cb842ecc29c3cddc8e7e448 SHA512 88ab0c46a6bdb4c524e66f5f58a8a32f5cb0b728129eadda4c5002625c4fcedd48f4c6328af3745bcdae5a6c2d17c77dbd72b860b35728f16379d3f98add412a WHIRLPOOL 59ecd56e98584b8f7378671f592a9a130c0c86a6c36735a06dec4fe6a069cd52d1df1627363c257ff4362fc4c176838eaff614bc674c5f38abc4adf4aa2c284c
+DIST percona-xtrabackup-2.4.4-Linux-x86_64.tar.gz 82348558 SHA256 1e59e4d061d9af9bbb821dc70dd8ee98a25afd70c5663f3c43d1011468d28b47 SHA512 265ffc8a6976daaa8de2a22e1db2a15734fcbfe4881cb3482130fccbc69bda7302b013adb2c52cf93a1881baaaec2b08e98f3e5252b295802a426a2597960039 WHIRLPOOL 5aef403ee24473b0300bd1f7c47c94ea9b34464f62273a4889cac814736764e1312455dc913a6556b97eebb70e3ec7fb365d72b24c8315f8029ed88f5f4c3036
diff --git a/dev-db/xtrabackup-bin/files/xtrabackup-bin-2.1.7-no-versioncheck.patch b/dev-db/xtrabackup-bin/files/xtrabackup-bin-2.1.7-no-versioncheck.patch
deleted file mode 100644
index 5460e439fdf3..000000000000
--- a/dev-db/xtrabackup-bin/files/xtrabackup-bin-2.1.7-no-versioncheck.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/bin/innobackupex b/bin/innobackupex
-index 1df8d91..9729b6c 100755
---- a/bin/innobackupex
-+++ b/bin/innobackupex
-@@ -142,7 +142,7 @@ my $option_rebuild_threads = 0;
- 
- my $option_debug_sleep_before_unlock = '';
- 
--my $option_version_check = '1';
-+my $option_version_check = '0';
- 
- my $option_force_non_empty_dirs = '';
- 
diff --git a/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild b/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild
deleted file mode 100644
index 2d55fe015c1e..000000000000
--- a/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="percona-${PN/-bin}"
-MY_PVR="${PV}-5027"
-MY_P="${MY_PN}-${PV}"
-MY_PF="${MY_PN}-${MY_PVR}"
-
-inherit eutils
-
-DESCRIPTION="MySQL hot backup software that performs non-blocking backups for
-InnoDB and XtraDB databases"
-HOMEPAGE="http://www.percona.com/software/percona-xtrabackup"
-SRC_URI="
-	amd64? (
-		http://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/binary/tarball/${MY_PF}-Linux-x86_64.tar.gz
-	)
-	x86? (
-		http://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/binary/tarball/${MY_PF}-Linux-i686.tar.gz
-	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-libs/libaio
-	dev-libs/libgcrypt:11/11
-	dev-libs/libgpg-error
-	dev-perl/DBD-mysql
-	sys-libs/zlib"
-
-src_unpack() {
-	default
-
-	if use amd64; then
-		S="${WORKDIR}/${MY_P}-Linux-x86_64"
-	elif use x86; then
-		S="${WORKDIR}/${MY_P}-Linux-i686"
-	fi
-}
-
-src_prepare() {
-	# bug 501904 - CVE-2014-2029
-	epatch "${FILESDIR}/${PN}-2.1.7-no-versioncheck.patch"
-}
-
-src_install() {
-	for bin in innobackupex xbcrypt xbstream xtrabackup; do
-		dobin bin/${bin}
-	done
-}
-
-pkg_postinst() {
-	einfo "xtrabackup 2.2.x is for MySQL/MariaDB 5.6 only"
-}
diff --git a/dev-db/xtrabackup-bin/xtrabackup-bin-2.4.1.ebuild b/dev-db/xtrabackup-bin/xtrabackup-bin-2.4.4.ebuild
similarity index 100%
rename from dev-db/xtrabackup-bin/xtrabackup-bin-2.4.1.ebuild
rename to dev-db/xtrabackup-bin/xtrabackup-bin-2.4.4.ebuild
diff --git a/dev-lang/python/python-2.7.10-r1.ebuild b/dev-lang/python/python-2.7.10-r1.ebuild
index aaf1b143e04e..de85de70feb8 100644
--- a/dev-lang/python/python-2.7.10-r1.ebuild
+++ b/dev-lang/python/python-2.7.10-r1.ebuild
@@ -61,7 +61,7 @@ RDEPEND="app-arch/bzip2
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
+	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )
 	doc? ( dev-python/python-docs:${SLOT} )"
 PDEPEND="app-eselect/eselect-python"
diff --git a/dev-lang/python/python-2.7.11-r2.ebuild b/dev-lang/python/python-2.7.11-r2.ebuild
index 9eeab0c3fe8c..6954f3f2bf72 100644
--- a/dev-lang/python/python-2.7.11-r2.ebuild
+++ b/dev-lang/python/python-2.7.11-r2.ebuild
@@ -63,7 +63,7 @@ RDEPEND="app-arch/bzip2:0=
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
+	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )
 	doc? ( dev-python/python-docs:${SLOT} )"
 PDEPEND=">=app-eselect/eselect-python-20140125-r1"
diff --git a/dev-lang/python/python-2.7.12.ebuild b/dev-lang/python/python-2.7.12.ebuild
index 992882b2ebd3..0856ef255289 100644
--- a/dev-lang/python/python-2.7.12.ebuild
+++ b/dev-lang/python/python-2.7.12.ebuild
@@ -63,7 +63,7 @@ RDEPEND="app-arch/bzip2:0=
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
+	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )
 	doc? ( dev-python/python-docs:${SLOT} )"
 PDEPEND=">=app-eselect/eselect-python-20140125-r1"
diff --git a/dev-lang/python/python-3.3.5-r3.ebuild b/dev-lang/python/python-3.3.5-r3.ebuild
index 42477ed50fc6..bc6f2a0a558a 100644
--- a/dev-lang/python/python-3.3.5-r3.ebuild
+++ b/dev-lang/python/python-3.3.5-r3.ebuild
@@ -51,7 +51,7 @@ RDEPEND="app-arch/bzip2
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
+	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )
 	doc? ( dev-python/python-docs:${SLOT} )"
 PDEPEND="app-eselect/eselect-python"
diff --git a/dev-lang/python/python-3.3.5-r8.ebuild b/dev-lang/python/python-3.3.5-r8.ebuild
index e7f91bd72fb4..b39a7bb978bb 100644
--- a/dev-lang/python/python-3.3.5-r8.ebuild
+++ b/dev-lang/python/python-3.3.5-r8.ebuild
@@ -57,7 +57,7 @@ RDEPEND="app-arch/bzip2:0=
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
+	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )
 	doc? ( dev-python/python-docs:${PYVER} )"
 PDEPEND=">=app-eselect/eselect-python-20140125-r1"
diff --git a/dev-lang/python/python-3.4.3-r1.ebuild b/dev-lang/python/python-3.4.3-r1.ebuild
index d7dab168b3cb..573a11e631ac 100644
--- a/dev-lang/python/python-3.4.3-r1.ebuild
+++ b/dev-lang/python/python-3.4.3-r1.ebuild
@@ -49,7 +49,7 @@ RDEPEND="app-arch/bzip2
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
+	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
 PDEPEND="app-eselect/eselect-python"
 
diff --git a/dev-lang/python/python-3.4.3-r7.ebuild b/dev-lang/python/python-3.4.3-r7.ebuild
index 51a14dbb6eb6..22cd3b3cf1e0 100644
--- a/dev-lang/python/python-3.4.3-r7.ebuild
+++ b/dev-lang/python/python-3.4.3-r7.ebuild
@@ -51,7 +51,7 @@ RDEPEND="app-arch/bzip2:0=
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
+	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
 PDEPEND=">=app-eselect/eselect-python-20140125-r1"
 
diff --git a/dev-lang/python/python-3.4.4.ebuild b/dev-lang/python/python-3.4.4.ebuild
index a5ef671d7e85..39e9bcca8cae 100644
--- a/dev-lang/python/python-3.4.4.ebuild
+++ b/dev-lang/python/python-3.4.4.ebuild
@@ -51,7 +51,7 @@ RDEPEND="app-arch/bzip2:0=
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
+	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
 PDEPEND=">=app-eselect/eselect-python-20140125-r1"
 
diff --git a/dev-lang/python/python-3.4.5.ebuild b/dev-lang/python/python-3.4.5.ebuild
index 433a3a373da8..b26c787b02e9 100644
--- a/dev-lang/python/python-3.4.5.ebuild
+++ b/dev-lang/python/python-3.4.5.ebuild
@@ -51,7 +51,7 @@ RDEPEND="app-arch/bzip2:0=
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	>=sys-devel/autoconf-2.65
-	!sys-devel/gcc[libffi]"
+	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
 PDEPEND=">=app-eselect/eselect-python-20140125-r1"
 
diff --git a/dev-libs/cdk/Manifest b/dev-libs/cdk/Manifest
index f50709a12f7e..59fb8e04c2f9 100644
--- a/dev-libs/cdk/Manifest
+++ b/dev-libs/cdk/Manifest
@@ -1,2 +1,3 @@
 DIST cdk-5.0-20131107.tgz 495455 SHA256 2b3670b95d330cce34ddd929f985c423cf86b05ba8a33bf5f217c4702131f565 SHA512 93e0c78bfd12fb9c554b9b6996b9c93542201afb67ddd63ecea7330171ca079da73d81b3f3b2f27a28ecd3527ed6c7333203a9438ecd196a66d3bad78233f439 WHIRLPOOL bedf5a441175436fb0eb54b216a61acd296d97dbbb2be1eb817b024778f58383f0ea00f6159c67c05f116f21ad6e0030a2d979aa8db2798a4f103f36f3e3198b
 DIST cdk-5.0-20141106.tgz 509310 SHA256 d7ce8d9698b4998fa49a63b6e19309d3eb61cc3a019bfc95101d845ef03c4803 SHA512 8a92363c8036acb61fe8dcfcf3690653f2573407123b8c684c0bf165d5b99b6a4c7e8bcded8773304ebc13108e90ae3488f0e74ed026f3bc69f6a5b007e651e4 WHIRLPOOL d497624acb49bec7a1f18afe13c1279f5e8c06b71d4f904b88b9f639e01fae0b4d959ae90df169c477292e0f56f787944e5cffddb4416d30d85784155bde2dee
+DIST cdk-5.0-20150928.tgz 515214 SHA256 028da75d5f777a1c4184f88e34918bd273bd83bbe3c959bc11710c4f0ea2e448 SHA512 5774e28d91edd477854e30eb456b7725987e82ec27f5cf055c1d1e46581e11d2958bafbac408124f274bf7454be68476d18643a265df7c74b8f43eb1895bf19d WHIRLPOOL 637cf7405139dedb82a21b3481f8673fd3c27289813e74da44afe739c258d6674fd4288f202166b9a624357ea686971010c06250f7770c2c37d538f0e7fbb12b
diff --git a/dev-libs/cdk/cdk-5.0.20150928.ebuild b/dev-libs/cdk/cdk-5.0.20150928.ebuild
new file mode 100644
index 000000000000..e5e68025f66a
--- /dev/null
+++ b/dev-libs/cdk/cdk-5.0.20150928.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit versionator
+
+MY_P="${PN}-$(replace_version_separator 2 -)"
+DESCRIPTION="A library of curses widgets"
+HOMEPAGE="http://dickey.his.com/cdk/cdk.html"
+SRC_URI="ftp://invisible-island.net/cdk/${MY_P}.tgz"
+
+LICENSE="BSD"
+SLOT="0/6" # subslot = soname version
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="examples static-libs unicode"
+
+DEPEND=">=sys-libs/ncurses-5.2:0=[unicode?]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${PN}-5.0.20120323-parallel-make.patch )
+
+src_configure() {
+	econf \
+		--with-libtool \
+		--with-shared \
+		--with-ncurses$(usex unicode "w" "")
+}
+
+src_install() {
+	# parallel make installs duplicate libs
+	emake -j1 \
+		DESTDIR="${ED}" \
+		DOCUMENT_DIR="${ED}/usr/share/doc/${PF}" install
+
+	if use examples ; then
+		for x in include c++ demos examples cli cli/utils cli/samples; do
+			docinto $x
+			find $x -maxdepth 1 -mindepth 1 -type f -print0 | xargs -0 dodoc
+		done
+	fi
+
+	use static-libs || find "${ED}" \( -name '*.a' -or -name '*.la' \) -delete
+}
diff --git a/dev-libs/fstrm/Manifest b/dev-libs/fstrm/Manifest
index e88758c5fcaa..21d16ad23046 100644
--- a/dev-libs/fstrm/Manifest
+++ b/dev-libs/fstrm/Manifest
@@ -1 +1,2 @@
 DIST fstrm-0.2.0.tar.gz 434627 SHA256 ad5d39957a4b334a6c7fcc94f308dc7ac75e1997cc642e9bb91a18fc0f42a98a SHA512 4425c3aa57f7c87dfa2a5cc6e3c9b7f8e293086c2092b57b5d227b13dba3ec23cb8460abbfaf153b2f3a27c6a613e31e7a805948cbc5d567707880f353453f42 WHIRLPOOL 25360591002a366bff79a626f6f1514155445eca9608163378e4be1278652c7581f9b893465e0f7bf1653ac140215104174c16e24ebbfeff033e9b0e079192b9
+DIST fstrm-0.3.0.tar.gz 185153 SHA256 531ef29ed2a15dfe4993448eb4e8463c5ed8eebf1472a5608c6ac0a6f62b3a12 SHA512 4134da0ed8579cb6784a419bba76b3be7487ec67b6fad65e0e662b40e668389010381176794d15da9c96339292f0faedc143f87b7ef3815b69bbc8b165af5c4d WHIRLPOOL 5ff46b41a25c581b525b42db6e2926546768318f602c55ec0ccbd5fe0de055803629786ea14e465045d93459ad3ff3a3a07e10e1b598113b0348284610dddee3
diff --git a/dev-libs/fstrm/fstrm-0.3.0.ebuild b/dev-libs/fstrm/fstrm-0.3.0.ebuild
new file mode 100644
index 000000000000..d37861de839a
--- /dev/null
+++ b/dev-libs/fstrm/fstrm-0.3.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools multilib-minimal
+
+DESCRIPTION="Frame Streams implementation in C"
+HOMEPAGE="https://github.com/farsightsec/fstrm"
+SRC_URI="https://github.com/farsightsec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="static-libs utils"
+
+RDEPEND="utils? ( dev-libs/libevent[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+	default
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable utils programs)
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -name '*.la' -delete
+}
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index ecac6fda6679..a8e85dfa0e04 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -3,3 +3,4 @@ DIST libebml-1.2.2.tar.bz2 60802 SHA256 476b08c6436a96c024a53e788e7c945ce9b41cd8
 DIST libebml-1.3.0.tar.gz 70425 SHA256 cd48a6d943905afe877e86f421647092956d71c7345dc9264a5123750ca8b158 SHA512 804b8e9e29add421304ef104f48170ee434cc97d6063dc4338b7fd6ad559733ed1bffd8440146674b70b3d6906f45ded4cc482d606c94c8c04bf424fd85c366e WHIRLPOOL b5656fa835753bee8b4cfa995db220de85d69604d7332e793c6b45c13100e4041e0fee8517940bde600909b529d3eee959340d3f997b174b249f13c4183ed5cd
 DIST libebml-1.3.1.tar.bz2 599116 SHA256 195894b31aaca55657c9bc157d744f23b0c25597606b97cfa5a9039c4b684295 SHA512 b42d198611e480a4938fe95b920f6ee6ca37453f9551990e4310ed82651f93284f1de1d871357b6280219634bbbf6a98d4ac988e25e7bd7b5bbf5c0ba5766334 WHIRLPOOL 10879d351eb66dce6e04b0a1635e370dc82a9215b1ee61ad4b300466257bb0b06219f3ea65b090e415aef354bb8e200e19e35859d25ec5d46fa3208501373801
 DIST libebml-1.3.3.tar.bz2 588607 SHA256 35fb44daa41961f94a0ac1b8f06801e88cc9bf2ad6f562ced8ab7c1f1a875499 SHA512 3ae048b468272e5ff1dc813121c1addcbbe324cd466e4b43ccce5aca148095190c10196433db951529ff62c587cc2b9a3c0c713db7921825221babaf7d4e824d WHIRLPOOL 85e973177ba1d437c0b461d81fd3b82432f22db5b1462fb6285cde7a0d6d8528ad7c9e24b0d64aa53eba78d44aec64d3842a96f00a0b6d72b255946967de1b81
+DIST libebml-1.3.4.tar.bz2 606205 SHA256 c50d3ecf133742c6549c0669c3873f968e11a365a5ba17b2f4dc339bbe51f387 SHA512 ebf5b71afe725e40ee6415463e51ca14810eecc2fef186caacd0269077f5febeb62623fd48674b21ea732f43a620d0c91603fa48d3f8d163284d1cf204642194 WHIRLPOOL 9502f132fea7d7d10add1c42da33bc2eac1a13b3b02f5b4eb331b1ab5f14a41a255503fedb16b579bb8defa94786d0f6fc5324cd55c06b6d7b5319de74a75e84
diff --git a/dev-libs/libebml/libebml-1.3.4.ebuild b/dev-libs/libebml/libebml-1.3.4.ebuild
new file mode 100644
index 000000000000..72f0399ab379
--- /dev/null
+++ b/dev-libs/libebml/libebml-1.3.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Extensible binary format library (kinda like XML)"
+HOMEPAGE="http://www.matroska.org/ https://github.com/Matroska-Org/libebml/"
+SRC_URI="http://dl.matroska.org/downloads/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0/4" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="debug static-libs"
+
+src_prepare() {
+	default
+	sed -i '/^AM_CXXFLAGS += -g/d' Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete
+}
diff --git a/dev-libs/libgcrypt/libgcrypt-1.7.3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.7.3.ebuild
index 00dbaf81f840..317f6a4b884c 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.7.3.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.7.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
 SLOT="0/20" # subslot = soname major version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs"
 
 RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
diff --git a/dev-python/billiard/Manifest b/dev-python/billiard/Manifest
index 58637ada63f8..9c629a4f0041 100644
--- a/dev-python/billiard/Manifest
+++ b/dev-python/billiard/Manifest
@@ -3,3 +3,4 @@ DIST billiard-3.3.0.19.tar.gz 150943 SHA256 6e6b8ec6e45b89389051737c7e6215d8e55a
 DIST billiard-3.3.0.20.tar.gz 150990 SHA256 688f9466b1c3ae14106381e6dbd328115e75c5260c542eb48e6c46931f6928cc SHA512 e068be5e0bc8bc68a38dd1cec2574da25494cfac2d9b4b951af3fd9f019080a4fe402d4b407162bcc0edbd0ac4fa406a964913e4bf1dd98dbf8a937294a34321 WHIRLPOOL 41a2ae0648d7f960c569491d0dea519787e3ba779fa27e71c2dcf12e7955175cf3b9697ca750f4e164e263abd880af287f5645c0864115ef88bb0088d31b74c2
 DIST billiard-3.3.0.21.tar.gz 151141 SHA256 9705f78f0a971b91a70b3b19aa7862401b6eb3b0bffc2a2e0702ed5eeaccdae9 SHA512 29c3e0b78858dc4693a122360a23b8a0f4a40f542ef5451b1c26e8606623a40a586f2f5a99d04ff91dd2dcc34f084fa35d6ee80ca6efd98690517dd46c6ead8b WHIRLPOOL cf4e9476e0b7b18f62f945408f98d96820ee8837dd4838e9fd7c080784e66c5688fe1c05bc91927aeb57365f036ef60b200220958b1bcf14c57dc8723434b7e5
 DIST billiard-3.3.0.22.tar.gz 151192 SHA256 d216181387317f8696c6d1c80a2491258d037493c1f0c6eb58992a549481e77e SHA512 751d6406efa4d4854070921eb91fa000e8cd01adebe36627e6cb1fb2281a9c9ab49694d3692fd666f8782804db5590f1fde9318873bbaa6765bcb45fad517bed WHIRLPOOL 6c25ff76fdfd50dd6cea63504acc412d264f354b2235ef6eab1444e8cf0c737bfd729da1107362bbd3afb1e813fb2c6f709ad9139db8c8a5f3f9f4497573e296
+DIST billiard-3.5.0.0.tar.gz 155959 SHA256 800fa0ac7b362585d43d2d4b8d6aeb5ada25796121956e15dc1e68cfe5319234 SHA512 c73adb0cd470e66cc6aaca848f24a991df3eda44e7adf0e83d2a7a1e87bba4381b165842e8cd297d43a4d01d4c006953107354b841cdad9fdde4e00e7a80c4f1 WHIRLPOOL 8b63cfd62dcf7f33c6441a6cc0f9fc6b668bef694c823ff6b3ffec3e6ea2d8c183639011d791038c621d83991ae686f9cfae50d8ece87b6c9ff373e935f55740
diff --git a/dev-python/billiard/billiard-3.5.0.0.ebuild b/dev-python/billiard/billiard-3.5.0.0.ebuild
new file mode 100644
index 000000000000..002e9c552c5f
--- /dev/null
+++ b/dev-python/billiard/billiard-3.5.0.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy  pypy3 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Python multiprocessing fork"
+HOMEPAGE="https://pypi.python.org/pypi/billiard https://github.com/celery/billiard"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/case[${PYTHON_USEDEP}]
+		>=dev-python/unittest2-0.4.0[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.4[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy pypy3 )
+	)"
+# The usual req'd for tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile() {
+	if !  python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx --builder="html" --source-dir=Doc/
+}
+
+python_test() {
+	cd "${BUILD_DIR}" || die
+	# The teardown in __init__.py breaks pypy's installed nose
+	if [[ "${EPYTHON}" == pypy ]]; then
+		rm lib/billiard/tests/__init__.py || die
+		echo "from __future__ import absolute_import" >> ./lib/billiard/tests/__init__.py || die
+	fi
+	nosetests billiard.tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( build/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/case/Manifest b/dev-python/case/Manifest
new file mode 100644
index 000000000000..f57cf4401415
--- /dev/null
+++ b/dev-python/case/Manifest
@@ -0,0 +1 @@
+DIST case-1.2.3.tar.gz 55405 SHA256 6e6a6b824ee2641657415305a343fa66d3cf9c29f25202ba749957b4f17f5051 SHA512 7dcc2fc593e4c5382879b9f09aecc35c0937d1070d945688e641d08611ecc263531a9d87eef730685cab41ed32a0e770b06ff36060b212d288752442814700e0 WHIRLPOOL c88f5e70cd2f377d3b0ff68110610d4a15ee76067b2bd5ea3243a667c9ff0baf2d6d235e555dd4c7a6da4e0c26aa81f3f9325672695f64603cdeedcf6b3079c1
diff --git a/dev-python/case/case-1.2.3.ebuild b/dev-python/case/case-1.2.3.ebuild
new file mode 100644
index 000000000000..2cbcd6228f04
--- /dev/null
+++ b/dev-python/case/case-1.2.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy  pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python unittest Utilities"
+HOMEPAGE="https://pypi.python.org/pypi/${PN} https://github.com/celery/${PN}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/case/metadata.xml b/dev-python/case/metadata.xml
new file mode 100644
index 000000000000..8b0594a5c767
--- /dev/null
+++ b/dev-python/case/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">case</remote-id>
+		<remote-id type="github">celery/case</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/ijson/Manifest b/dev-python/ijson/Manifest
index d0aacab59263..222fded2c45f 100644
--- a/dev-python/ijson/Manifest
+++ b/dev-python/ijson/Manifest
@@ -1,5 +1 @@
-DIST ijson-1.1.tar.gz 8415 SHA256 33d10eac83d6dd757e2861b4ce06b3467a828481d608017af3d0caeb023ba32a SHA512 aebb3e46688b785a18366230b9f94c1b36d44f0764d8603b7ae50a2426b53eddad883c5d1fbda8f52d655d789880f1a7329bc6d1383ed963e9835d7ec40bdfdf WHIRLPOOL 3921e6fa8f0f8a1b17aa234cdcdcf3fc0d3bb97fce78803b84502ac762f5526cc526ee5fc48d65ecf4e88cde90be71414ef4912bf95781070e5266b7b3809f7b
-DIST ijson-2.0.tar.gz 9560 SHA256 85bfc06b2bb492f205bc5dd9531ff0e64d2e18e03e64665934715d58331c1dd8 SHA512 8ea8b89766d3e3ccc3f0bf348ba9068cd80f24aa7648e7bfd2272e701430445f2ab81744280dce8dde9e18dd0582f0fde784aae61493479b4f5a44a5175d7fc7 WHIRLPOOL 495e023bc79b5ffe55e50975af3c6fb65993156b2a9a32e1b98b1891fc8235c739d854baf511625fba5b1806fcbef8944809e3de13e7feaaedfeb8489c6d7fe3
-DIST ijson-2.1.tar.gz 9859 SHA256 bc69a512399db0469f5faabe34f9f7ce21964d1993c6a6720cc4cea911fb8a45 SHA512 67773540c1d7df6aaaf22b064d0ea7660c8b69b4371a15ec9f46228f1ebbe604aa29b1d93821f62928b41841ecd411419d39c636aae7dddacffd2b8d881d865e WHIRLPOOL ede0bb85abad4023d06eeb036249ffeb2aaafb95774da9a280cb765e2ac0c5e40dfa3ca80a0f043616884391da97d95847ff727e4593ecc9c3db045606c1567b
-DIST ijson-2.2.tar.gz 10282 SHA256 58aeeeda35c9d72061a34861ca7ff7b214e701e413b65f8e9ec06589c4aa2d30 SHA512 bcfc3571ccf6b011e745a2bf84b50ba3793e999cbebb0a2d377d56fa68d5068ecf549457fd14de6849059bc909f2493d6def41c1df581e1283e2826eb1b789b4 WHIRLPOOL 72c0210500f64ec39dfffb9c6aa5f7dcb2b969981bf908af55c554666687694bf0f68912281acdb019cc1beace31ea646c3aaf6bb34330d877ac3d1d1e83aa5f
 DIST ijson-2.3.tar.gz 11800 SHA256 5db72cc5ebad786ee2cf85ae277ae068c14f965e0747fd8b65bf4d8d9c4c8395 SHA512 4d6647cb72661b26a3b36addeabec79fbc047a6c3b86aa419c178dfb8ef09bcdefdf37ed729f26b4b6b176cec06230ef3dab53bdff4c4b401bbc835eb486d038 WHIRLPOOL 0f1bef3e7f3237d259839253cd0c433bdeafdef4314cc2f50d1965abb835179a4781c39f11a8fd4cdfdec1688c53f26bec7d051a94b40fa808ef71a7df6be5f9
diff --git a/dev-python/ijson/ijson-1.1.ebuild b/dev-python/ijson/ijson-1.1.ebuild
deleted file mode 100644
index 9cb0868a23a5..000000000000
--- a/dev-python/ijson/ijson-1.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Iterative JSON parser with a Pythonic interface"
-HOMEPAGE="https://github.com/isagalaev/ijson https://pypi.python.org/pypi/ijson/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/yajl"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/ijson/ijson-2.0.ebuild b/dev-python/ijson/ijson-2.0.ebuild
deleted file mode 100644
index 6aec897e1735..000000000000
--- a/dev-python/ijson/ijson-2.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Iterative JSON parser with a Pythonic interface"
-HOMEPAGE="https://github.com/isagalaev/ijson https://pypi.python.org/pypi/ijson/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-libs/yajl"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ijson/ijson-2.1.ebuild b/dev-python/ijson/ijson-2.1.ebuild
deleted file mode 100644
index 40725ac9b58f..000000000000
--- a/dev-python/ijson/ijson-2.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Iterative JSON parser with a Pythonic interface"
-HOMEPAGE="https://github.com/isagalaev/ijson https://pypi.python.org/pypi/ijson/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-libs/yajl"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ijson/ijson-2.2.ebuild b/dev-python/ijson/ijson-2.2.ebuild
deleted file mode 100644
index 4526124f082c..000000000000
--- a/dev-python/ijson/ijson-2.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Iterative JSON parser with a Pythonic interface"
-HOMEPAGE="https://github.com/isagalaev/ijson https://pypi.python.org/pypi/ijson/"
-SRC_URI="https://github.com/isagalaev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-libs/yajl"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	${EPYTHON} tests.py || die
-}
diff --git a/dev-python/ijson/ijson-2.3.ebuild b/dev-python/ijson/ijson-2.3.ebuild
index bd736567e04c..4ac6992aae42 100644
--- a/dev-python/ijson/ijson-2.3.ebuild
+++ b/dev-python/ijson/ijson-2.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/isagalaev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-libs/yajl"
 DEPEND="${RDEPEND}
diff --git a/dev-python/pafy/Manifest b/dev-python/pafy/Manifest
index 68976e44592c..f531a58f2048 100644
--- a/dev-python/pafy/Manifest
+++ b/dev-python/pafy/Manifest
@@ -1 +1,2 @@
 DIST pafy-0.5.1.tar.gz 26295 SHA256 1e1f6f841e87875004679e200389e751f7ae5f45efdebc257f5b8191d0572920 SHA512 d18b04f0785124b516fc68eea3b11ede3c9cf6f59211f1536e3c936ccf8f0a3781a7af1c6f8f6c31651eb6dea30b6fc780916cb1c280d813a319b0687f9d4f4b WHIRLPOOL 01914026a0dc56affe08dfc5eb3e3fbbbb791efc872c05f1610fab6e266f23c5db27bb66dd811507be53fe12e60d3de79be916e162f168bfd43bcfd1539af5d9
+DIST pafy-0.5.2.tar.gz 26343 SHA256 11e0cb83bd9e636bc4d0d6f7d7ce964f4975c6f0e037fe285ef2acedafcf7bb2 SHA512 bb292bdb0d7cf6312234fc4135d4ae5ecf5fcbc38ffc68cb1cc394a46430ab6681298591fa206eaf09eea9efbed90810453fcf973ec17f813bd82b3994401185 WHIRLPOOL 15ecd015a766c14791dc7990e17282e302382e65b67d4bc70831758248e780f1b494db4098aa07b5fff40c0a27e5a2fd62da59a9132ab1527dc95792c10fe36f
diff --git a/dev-python/pafy/pafy-0.5.2.ebuild b/dev-python/pafy/pafy-0.5.2.ebuild
new file mode 100644
index 000000000000..61d4ff0db25b
--- /dev/null
+++ b/dev-python/pafy/pafy-0.5.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+inherit distutils-r1
+
+DESCRIPTION="Python library to retrieve YouTube content and metadata"
+HOMEPAGE="http://np1.github.io/pafy/ https://pypi.python.org/pypi/pafy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="net-misc/youtube-dl[${PYTHON_USEDEP}]"
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index 17dd4a88d6bb..c4d41345b1ff 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -1,2 +1,3 @@
 DIST 5.5.1-0qt5_docs.7z 99268409 SHA256 012b6e7fa6060f19e07a99777b6187b1be7597a94840fc051f0a08dd5ac79182 SHA512 ce5054bc7978e5dec4fdc7fadff29e078a39e5463dffd0985fedc80216587d53166b88457e43dc11dd1e8fbe09e26c4a47669cd28983fd7e27e8fbaf182f8945 WHIRLPOOL 0df887a24157363ad269f5e302e0fc4d5a280ea2e22dc906d06d307c436ada6f26f85e33030515fa3d13d4402d282edec3dc9ad8b36d06a52776e6b284d161be
-DIST 5.6.1-0qt-everywhere-documentation-5.6.1.7z 125583367 SHA256 94db176dcf795ff614c7c4e322bc6a8e41f740c3416a8f650608fb4eb8388bb4 SHA512 ac5474d11be5508f277cb73f7d1bb49027b3dcfa98565af49f1a74ba2bf638c3e1dd349d039ddb5a5a83eee4c5e34339d83d5b3122f5cdfe01cb4fcfccd31b1f WHIRLPOOL a35b466b1d04f417299a39102c7032242adac7ccf53254fad789fae0f3b5ee45eb3cea081ba1891a94ae3faf7c3f8de9fee57f5bdf2a06b70b0419c0486fd6cc
+DIST 5.6.1-1qt-everywhere-documentation-5.6.1.7z 125597447 SHA256 cf78e4f7dde039197c9962491fb13a99862fdc6eaf4c61b87388bf33e4071995 SHA512 65a7afada70489b382fcd5c7417f3ddb3c184eaa954042370bce26f96de98f9b068258239a0c5f14c73c802ce5428e214a6be4fb16010033f03a62f8f370f28d WHIRLPOOL 00ad1a4360f483dbdf8d6ce413c60fda0e4546c84fbdbb22de4d51a6ae9334e4c6de6bd402cb72cf088bb404d4836e87fa04147e784b373043fc6694c1162c07
+DIST 5.7.0-1qt-everywhere-documentation-5.7.0.7z 173871175 SHA256 62311f5cb3eb85169230aafbc9ab5487eb68d9ade04de6918fd0e16bb3ba7fca SHA512 074dea5b40811990461a349e768bff94513af1c59f680f5fc809cf2c2b2e73277dc4be00eadb0aff62b60438a63e34d999e12ac718b62b910ddcd21cfe6e7857 WHIRLPOOL 1b20d8335a5ac448e1b1a14b607e9ad585e64132e0584102466b6796669955cc076a395186ca22243f23560a21d365468af199d4ba0ec9b56d266a51db386d1f
diff --git a/dev-qt/qt-docs/qt-docs-5.6.1_p1.ebuild b/dev-qt/qt-docs/qt-docs-5.6.1_p1.ebuild
new file mode 100644
index 000000000000..c73d4f77ec9b
--- /dev/null
+++ b/dev-qt/qt-docs/qt-docs-5.6.1_p1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit versionator
+
+MY_PV=$(get_version_component_range 1)$(get_version_component_range 2)
+MY_P=${PV/_p/-}qt-everywhere-documentation-${PV%%_p*}
+
+DESCRIPTION="Documentation for Qt5, for use with Qt Creator and other tools"
+HOMEPAGE="https://www.qt.io/"
+SRC_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${MY_PV}_src_doc_examples/qt.${MY_PV}.doc/${MY_P}.7z"
+
+LICENSE="FDL-1.3"
+SLOT="5"
+KEYWORDS="amd64 x86"
+
+DEPEND="app-arch/p7zip"
+
+S=${WORKDIR}/Docs/Qt-$(get_version_component_range 1-2)
+
+src_install() {
+	# ${PV} instead of ${PF} is intentional
+	local dest=/usr/share/doc/qt-${PV%%_p*}
+	insinto "${dest}"
+	doins -r *
+	docompress -x "${dest}"
+}
diff --git a/dev-qt/qt-docs/qt-docs-5.6.1_p0.ebuild b/dev-qt/qt-docs/qt-docs-5.7.0_p1.ebuild
similarity index 100%
rename from dev-qt/qt-docs/qt-docs-5.6.1_p0.ebuild
rename to dev-qt/qt-docs/qt-docs-5.7.0_p1.ebuild
diff --git a/dev-ruby/bson/Manifest b/dev-ruby/bson/Manifest
index 2bd86f9740d7..c77a4a1a0dc3 100644
--- a/dev-ruby/bson/Manifest
+++ b/dev-ruby/bson/Manifest
@@ -1,3 +1,3 @@
-DIST bson-3.2.4.tar.gz 51208 SHA256 adcc339e4618fbd9bc8dc91677971118834adfd19bf6ae783d79308f2fb446b2 SHA512 d7817d5ec068895e4a883921dc8495aa9d44401b7a66c77f29b71434428efaf417f1219ebbb1bd7065a8beebba41c0c461e7b9f5376bc9259ada695f6eb97715 WHIRLPOOL 670239430ec0ccfe01a4a50d843fbc871faea06b0d5cf7db4cf53d32ec7a6dcca7ef06497589d1e0f4ee8e20e451bff33b7d0bcfea298b71dead22716f07eab2
 DIST bson-3.2.6.tar.gz 51846 SHA256 b7d848b93de622c32cc65cf6debf21aaa0e66d554d65cc7805dc8f76e56c55fb SHA512 da8d7c4e50bd5387a50f0ef471f1d854e0a1bf3f109bb793b16c8e4d110f6b98cb37aee126176eccb097c5d7814360ef85e96be4aa4704226a8490984a5dd3f2 WHIRLPOOL ece0e17aca10f684cdbea703702b5f886340fe93ede11045430c7711f2d546c5e2558003261d8252a29a55fc999664be0315f0ac693d02181a9dcf006d44a3c6
+DIST bson-4.1.1.tar.gz 55417 SHA256 965d0da14886e795230686168676784c74117c705b262ee468205c0066166f64 SHA512 b98b568fe0a94e6430433a9bb57930c0a95c9b268d928a6fabb1ce6bd4343406e700de11db531f6a49bc270e449637c70ce0ad0a8f7f6cae7857f0ad627f1956 WHIRLPOOL b7f0735cb0d3e49d257f805398368e397a70f87dd38460ce04064ca34fc0f9b60f6e776403955be0e2db9360b94bb0b09f48d5c3e7036a10d8393b715c455b41
 DIST mongo-ruby-driver-1.12.0.tar.gz 360669 SHA256 84c87d26601c9bd91a6604bcb3630be50d239e471542f9b0a68379705dd03e11 SHA512 725110c527867379def85fde50b6825e94a320356f062e4403d9d55c223f2503676f83ae42916d6ab45afd90d30b2a4272519e070c4af2095c0965297fd72bb6 WHIRLPOOL c152aa579a0535707909560cc73fc878521aac95c034ec71bca6c2397754b5e057c1e7ca32f6b2b3393ce975f122e65926820cdde29aa5f5734fb9717bd980e0
diff --git a/dev-ruby/bson/bson-3.2.4.ebuild b/dev-ruby/bson/bson-4.1.1.ebuild
similarity index 92%
rename from dev-ruby/bson/bson-3.2.4.ebuild
rename to dev-ruby/bson/bson-4.1.1.ebuild
index f7eda927d8f5..d7874baaca3b 100644
--- a/dev-ruby/bson/bson-3.2.4.ebuild
+++ b/dev-ruby/bson/bson-4.1.1.ebuild
@@ -3,9 +3,9 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.
 RUBY_S="bson-ruby-${PV}"
 
 LICENSE="APSL-2"
-SLOT="3"
+SLOT="4"
 KEYWORDS="~amd64"
 IUSE="test doc"
 
diff --git a/dev-ruby/bunny/Manifest b/dev-ruby/bunny/Manifest
index 95c50b351e28..00b0b8133eba 100644
--- a/dev-ruby/bunny/Manifest
+++ b/dev-ruby/bunny/Manifest
@@ -2,3 +2,4 @@ DIST bunny-2.3.0.gem 184832 SHA256 798d16dcecb47bbfea5226aa4a433e8aa4a530f0d1249
 DIST bunny-2.3.1.gem 185344 SHA256 3e1f727d93b18b7b94fd7fe2023b281272895b2e5643ce65491c015ab20d3978 SHA512 54a5b91904d8692febba8ec589320a41b4007f2c6fd5a809b81d78625a8d4567b911af393bd9fb7b3a6f62116824d54b51c4c5fc5d186b870686eabfc82b13bb WHIRLPOOL 3613901312662059e9cc0a70a323f9135c8a94363ee2a325f359444e74bcad7e69fcc4c63e7b3aa12fd21aa206f663d26cdf0b943de0a538bd34818cb8b54dd4
 DIST bunny-2.4.0.gem 187392 SHA256 bcce78445d163cbce9a55c122468f2d3470db16e011a23e793471dbe746a2655 SHA512 d5fe6588045867ab773caa05adc66bfe52dcf8913b919843f9704cb715848d25fe65ff453daaee11438d6f1e9d4cd0b1cbc67a16c3ff3bc62f3dc2dcc7ad5902 WHIRLPOOL ef4eb07bb2d62451a92b57484f4f804f74da8dfecce888c16c6a0ed72d42e1d62fe4d2a3c65454e0ca700e27e0b6bcceab3f69fcab6193bfef6d58416eea8ede
 DIST bunny-2.5.0.gem 188416 SHA256 bae146f653e4e9ef75fddf34577c572bfe829b83f2cca272c159db5d9e8648a9 SHA512 321ac85e5cfd0abe8111708ca149c779b5fc0694084b6e064c1fee90f7c9a4802e4dfa6cae0cc58d0ce9aaf3c59f736064267c9aeac3b8c795a1da5a434d8aff WHIRLPOOL 5c54e82654d649b559da5472fd0c462e991549b28b843a307afc8b87ce3ebb8f1df139a1ddc655cf9a706aaf584c48b2d653973a439f9be0fb2a913cc4016e36
+DIST bunny-2.5.1.gem 188928 SHA256 8a05fe5fe105545b2509fb941f069cd61904cf780374cc0aed7ab421893a1e59 SHA512 a1d1a13f50d97fcef065b7f30841be1f7a3215ac3fef743a01ab0b7cc0582512a7baa1511eff930352bed02c60abba6e4ab3802cc5dc89d032cfafc92e34ff36 WHIRLPOOL 638fcb51c73dd9933190c7a91cf73b290f52a36fcd8eb5f6ee4df9ddc2515b12122a4369959efd509cdd82dda1f98d132b1a6efbe9013244c7b800525c98bd16
diff --git a/dev-ruby/bunny/bunny-2.5.1.ebuild b/dev-ruby/bunny/bunny-2.5.1.ebuild
new file mode 100644
index 000000000000..6a98443b2126
--- /dev/null
+++ b/dev-ruby/bunny/bunny-2.5.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+# Tests require a live AMQP server.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Another synchronous Ruby AMQP client"
+HOMEPAGE="https://github.com/celldee/bunny"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/amq-protocol-2.0.1:2"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	insinto /usr/share/doc/${PF}
+	doins -r examples || die
+}
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index e7e132d13f2c..28d735827524 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,3 +1,4 @@
 DIST byacc-20140101.tgz 244706 SHA256 78aea5a34ccb6c9f1ff673a94cd3e66b0f669b7a042c2fcfdada85f0f399421c SHA512 83a2d20d3ffebd8019d9e35216d37cde6beee054aa9d0e4d5d2498069b920214cc0c866beabdf5b4ab2dd4399c7dbb3a2fc23209b80df02b1fe8f5f16def0a9c WHIRLPOOL 6c6dbe6a7b8d495792d9eed0959ec734b56cd9cfcf793115cc9bc56e5e7e7ab84284a9ca9928ffd42bc9fee02612743301965e438934484bfc779ec33a6d36fc
 DIST byacc-20141128.tgz 710145 SHA256 f517fc21f08c1a1f010177357df58fc64eb1131011e5dcd48c19fe44c47198d0 SHA512 a41debde13d489e47c635bd61ce691e7b0a1470a91df3d16e43bd7c0985064708c4d69b8fabe2134ac4d06b17e484ea9c0b7efc7a624e7d8b7ed850e89afd71c WHIRLPOOL 747b86f7292012c21204c6c7684dc5467465fd1073a0aa266d5a8cb31e131a129305dd4db519876fba97961614e29c7546efa27d7b47e053355b0fd381315c06
 DIST byacc-20150711.tgz 714438 SHA256 c354e4ee14c4a1bf11e55dde9275011d14887ef066406a088b6fa56caf039248 SHA512 348558046acca31a39e8df480ae4c46ad03a1b073a51877a8981914bce65e8922e83e14c45eecd0e122c9d3d018cd4b6ab8c7f29b8dbfa13d648f2f86104a4e9 WHIRLPOOL 212615a81bc70db84820259dd8a61e27efed28a796e037c61e5f13e310f64b5aa8cdfe7172de120b19dbeda176118c625f09a13c030d98ab8b6028d238ae4420
+DIST byacc-20160606.tgz 706191 SHA256 cc8fdced486cb70cec7a7c9358de836bfd267d19d6456760bb4721ccfea5ac91 SHA512 b8d2e9523aa615399dd6c3ed0efe90b4ac943dc8039b655958db8fd4ebd0bd920af9a7a5a4c8e525a0f04e4bfd76474e39bbfa861068851d230e4b4726ca3fea WHIRLPOOL 61932d8984c4aabb511b9b74b6626eec4b055f08175ffae4f49f3185aa440efc6f2c5935f0cd09d78334dac0d9b29b0d4c4b951858dffb41a3606c5347361a52
diff --git a/dev-util/byacc/byacc-20160606.ebuild b/dev-util/byacc/byacc-20160606.ebuild
new file mode 100644
index 000000000000..4e8eb6dfab58
--- /dev/null
+++ b/dev-util/byacc/byacc-20160606.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="the best variant of the Yacc parser generator"
+HOMEPAGE="http://invisible-island.net/byacc/byacc.html"
+SRC_URI="ftp://invisible-island.net/byacc/${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
+
+src_configure() {
+	econf --program-prefix=b
+}
diff --git a/dev-util/byacc/metadata.xml b/dev-util/byacc/metadata.xml
index 6f49eba8f496..56c124413057 100644
--- a/dev-util/byacc/metadata.xml
+++ b/dev-util/byacc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-gfx/pngcrush/Manifest b/media-gfx/pngcrush/Manifest
index ad7aa4fea2f2..e2674d2ae655 100644
--- a/media-gfx/pngcrush/Manifest
+++ b/media-gfx/pngcrush/Manifest
@@ -2,3 +2,5 @@ DIST pngcrush-1.8.0-nolib.tar.xz 60224 SHA256 baa7048351c341e3a0c4769db7093b3206
 DIST pngcrush-1.8.0.tar.xz 358772 SHA256 94491583c625e284e580f102657f9c2b3036372ab486e08682112f6cbb66522c SHA512 b572d6ee3aebffdf60836adffabff84b6ac12a50f9b33b5d6e7749af728f6aa441d53cb66926d40d988a94864524351f92edba72d3f0f55206746aa45037d653 WHIRLPOOL 2209a267cd54e6e6fde6e7f2e693065e83585e990801e4b704f3cfaf11d953abc44aa82626c6e7badf524214f5bc692831e72b7f7f0cb61b1f104a220d2f2925
 DIST pngcrush-1.8.2-nolib.tar.xz 61588 SHA256 4a2b4a0445008f0d528cffebd143ca9b15ec41cbc5abb79ce244d6eedaf452b1 SHA512 f0bfd95a84c9eef48abe624ca8ea4c2064862e9b6330776f91d7647b2796b1221a9edccf8de73fdbad7031cdee0d161072ce44063c60a6a7880a51130fb5c0f9 WHIRLPOOL 07e5566bb12e82e34472d72d96c8eb35a34c7a3282763e5fb8d13f4551d3f31b4dd651e1c3fd5fee9f779d8978c8be933455329ff0ea965e68579237ece2096e
 DIST pngcrush-1.8.2.tar.xz 361644 SHA256 0fa49fdd8bbdc290aa6a9958ad9482ae60a7a229bb237bf35e7bcfe1ee216440 SHA512 6f5abc419f3a0c8dad237d941183b58678752157076bf5392d41cef1ced937ba891d0443164e832142d8c7e5281032f5c10ab1545c870f2ccffa5a452f97b43b WHIRLPOOL da9baca97b449215068f67601ea467c2eee27fbd2c956b6be6ecc0b361ef4a91f7dbb29ad308a62fca4a2997c090bfb985c03b56d129a3716d2c9b3fc7baee9e
+DIST pngcrush-1.8.4-nolib.tar.xz 63548 SHA256 4ef6d790677cf57f622db693337d841b60d62c044e8681299245c298bd56161a SHA512 f246a62727d5ecfda72e4be544c857ff4e67673cc54ac80ba60db5b1b2bea68c22780dd3999d76ee0ccfde5b8ca001c828ee22f46431e1b22e972b37f88f3192 WHIRLPOOL 3cac34b5b982711abb3c58c064830b0bd319420cf590939c569552ac01c2ce8ac25af42f3e5ab5349a54b4d8186a6e43373e69f1f4bc764803fe5af7d56bcd91
+DIST pngcrush-1.8.4.tar.xz 366980 SHA256 25cbdb0dec7fb9f6a1bddc172a807a3123ee88144cfe955f25502329ea620821 SHA512 2e9919f82f07b98e341a4eb65f814514d0dc731a36677e5ef18486fb858694c7d6b9a0c80e1b2cab2a9354eb14239ce8169f53efd64ebb42405066f1fb175ef2 WHIRLPOOL 7a5e63994b5d198c8a7b8e02564a41319a7fd2ec2b980e93f7dffd61ad121909cb3d3d6e31e4b58af53d1884101b22bae96cdc2693e8e70310cdd3dad0e38fec
diff --git a/media-gfx/pngcrush/pngcrush-1.8.4.ebuild b/media-gfx/pngcrush/pngcrush-1.8.4.ebuild
new file mode 100644
index 000000000000..d7968509eba7
--- /dev/null
+++ b/media-gfx/pngcrush/pngcrush-1.8.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="Portable Network Graphics (PNG) optimizing utility"
+HOMEPAGE="http://pmt.sourceforge.net/pngcrush/"
+SRC_URI="system-libs? ( mirror://sourceforge/pmt/${P}-nolib.tar.xz )
+	!system-libs? ( mirror://sourceforge/pmt/${P}.tar.xz )"
+
+LICENSE="pngcrush"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+system-libs"
+
+RDEPEND="
+	system-libs? (
+		media-libs/libpng:0=
+		sys-libs/zlib:=
+	)"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+pkg_setup() {
+	use system-libs && S+="-nolib"
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} ${CPPFLAGS} -Wall" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc ChangeLog.html
+}
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index 3c0fb7f1a0f4..b7b26554d668 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -1,3 +1,4 @@
 DIST libmatroska-1.2.0.tar.bz2 80394 SHA256 8b68ed72c4563363fc17517d0fe0862d6a51747870f51ee7d1bb362274a5d44f SHA512 59fe80146dbd287f435fb477f2e589b8e5659fe5abb1a0869b1f6ca4b85e281431b7a18f1e3728d2b406b141039ab1b5e6a1a247a2bc23a7e64e7b5e67e29374 WHIRLPOOL e6706ca647306784a4e056e49db86375b48968e05fe77b7bfbea54c3c2d22adf28c52b88a9604ea9f1251f9f050e3b34cedbe2d415a01b8b216a52064c1934e9
 DIST libmatroska-1.3.0.tar.bz2 80542 SHA256 5231ec958571365e719a6fd3c220227af6cf0f14e0bd1bcf766ddbc068d18e69 SHA512 adbb5f85b0e55e39b6a5f629bac82041fc8d1ac0cdf8aecc6ea9966320c35aee4fe9437ca620229b7e15d3d8f7c2d4cf1beb71280789e1e6700087b4d2ec0c8a WHIRLPOOL 341e5b7568f1d609c98e1b164ca5eb4b1a27db33e1218982a48197975b66c46614a2d76b659a094d6a878f491a1a2400bef44ccceb19ca1fd10bdecc4a471fc2
 DIST libmatroska-1.4.4.tar.bz2 604396 SHA256 d3efaa9f6d3964351a05bea0f848a8d5dc570e4791f179816ce9a93730296bd7 SHA512 19d16d5fb4e1a5f516c4b5774e278c35190af22b4adf7267b25ad933b5cf16e127919ae34fe3baa573ddf09429c42155fc24e3df818f854a45d21d927c1e7090 WHIRLPOOL e37f526fce0e551d4ce8f6e495151ba92009ce6e9b27ac9c6232a83421d839955b0a8db0028a5a790fbdbf7806d4b0af8bb0354a755fa2b2b17fcc01682b1301
+DIST libmatroska-1.4.5.tar.bz2 612987 SHA256 79023fa46901e5562b27d93a9dd168278fa101361d7fd11a35e84e58e11557bc SHA512 94ce6fd920e5023b2846b629438a0bd42ff80f21b8f96e270d280311fba3619ab59f1cc6b73778c014ca2dbf060f3b119da052ea143f79aa1e83fac888799f3d WHIRLPOOL 215636ed993bd4c93228204457b2c8989678929f6b78db4aec978eb79e084dd22b892a2a2551f8ce9c4933c0f483b071ddbed51d6c0d6e04f82ed9234e2b3e4d
diff --git a/media-libs/libmatroska/libmatroska-1.4.5.ebuild b/media-libs/libmatroska/libmatroska-1.4.5.ebuild
new file mode 100644
index 000000000000..2629ed43f504
--- /dev/null
+++ b/media-libs/libmatroska/libmatroska-1.4.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Extensible multimedia container format based on EBML"
+HOMEPAGE="http://www.matroska.org/ https://github.com/Matroska-Org/libmatroska/"
+SRC_URI="http://dl.matroska.org/downloads/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/6" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/libebml-1.3.4:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete
+}
diff --git a/media-sound/abcm2ps/Manifest b/media-sound/abcm2ps/Manifest
index 04b5c1265b10..7bfbfd63b20b 100644
--- a/media-sound/abcm2ps/Manifest
+++ b/media-sound/abcm2ps/Manifest
@@ -1,5 +1,3 @@
-DIST abcm2ps-6.6.22.tar.gz 298108 SHA256 be3dde653a349c8875dd1c98810c7a5263ddaaee9bc99085a41749c3e53ce560 SHA512 fb7e526e7036456df8f8826c9d552de1ff9b007cdf5b5a623ac164a346cad9af07d26ed081d8693ff549cfde37fc541a02eea2d8cb45f4902b66ac05ab96f939 WHIRLPOOL e7d82037462f60ec4c9f6a8411c109eaeebae09373169d5d3b751d789c2c221d88a7062a9b6750e25b8062f999ea213f0c3d031390ea750dcfe9868469424363
-DIST abcm2ps-8.5.2.tar.gz 231017 SHA256 466446ef3007a3bbedf01667e647ba66fcdd81e3bc714bfe5b13a1c16f536c69 SHA512 605ad9eed7470ab89ce87cb0192d58cdfce6dd481b787f58c829c8cfed999fb11ffccbc1fe0ad325a311eabf40405f1ae676c7c64ce84db0ecaf9d58b509b293 WHIRLPOOL 06ad4b92557cd65fcf18b80a40aae36b688137793397cf9aef8e286b73af1218cedacfcbaff8e6e4bd29ab78aac158ef174dfc3eb7cbe00ae560a54cd169636e
-DIST abcm2ps-8.8.3.tar.gz 238617 SHA256 7a802a535ccb92e8ff0231ba70fdc9e522f9fbadf00d5a22c0a833853730db17 SHA512 61e6ebbf822a48d558e78e876ed123a7ed5125d858aae6de30b16906c3023509caaa52eeea9123c59fed3128d079965fe0bc95b2603c444bb4d01cfda22d24b3 WHIRLPOOL 5c14ee3c86714c94a65ffea4b6397e891c954f771523df028691d034f549d96d63324e3a7b2f09bd8856ccfd2567a8163d632864d0e9ae4ded1caa3e7c71fa5e
+DIST abcm2ps-8.12.1.tar.gz 237316 SHA256 792eb95495f8b731d9487728a97778c7bcc2f3a389ad775e9dc0392fbb4bce60 SHA512 2cd21cdc842ef000ce8aaaac372842d0056b3df43c1741a80b4653dc584bcd1279196835917b5f16869896f3b0ad2c8f7bffaff0cf159547985607b251e37be7 WHIRLPOOL 8c572a5e0f74e624d7e39abf1871becc227ede2267b2d38a4d5b3430151472238e7c87e9fe07916615988ba544b6b4694ab64b02463ce822e08547610ca64f71
 DIST abcm2ps-8.8.4.tar.gz 238574 SHA256 961ba76372832bbff5e07eb89c8e9ff98817fa3d7f4d13b6eedd16937120937b SHA512 f139f2bd324742a23ee9db3768746792974e6e8a78e65547cec527a7b10d4bcbacf1687dd7966791910efb8ea972042031186f89913d1051d52fb46787b34229 WHIRLPOOL 11f6287d2549d9a8d804eb9c363f505385552a5a6b3c80c676214890c0fdbd874124ff2f3cf5f4e4b72d4611e2805cea8c4a45e1ad7c65cc71b8d8a1783d3ca6
 DIST transpose_abc.pl 21045 SHA256 bd6960872bfbc9f71f183f36d533ea33b8cf62a6027b447f0b0b8adfa25a2848 SHA512 dc2623608a7b59d7e0c4d25160e69f696f170e9938dc3e035edbaf6f0163b4c6139892ec8734ea2aaba997507dcf32208562e898690600dc3c199046d4d151f3 WHIRLPOOL 81e327bbd76b40826adab06f7756c79c60289b21432b792c848db3ba1354528fa4f1a074cba890b6087cfac6e712427c6cbb2c9e6679c8ced22c362f6ec005f3
diff --git a/media-sound/abcm2ps/abcm2ps-6.6.22.ebuild b/media-sound/abcm2ps/abcm2ps-6.6.22.ebuild
deleted file mode 100644
index 36b5d0c2c545..000000000000
--- a/media-sound/abcm2ps/abcm2ps-6.6.22.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="A program to convert abc files to Postscript files"
-HOMEPAGE="http://moinejf.free.fr/"
-SRC_URI="http://moinejf.free.fr/${P}.tar.gz
-	http://moinejf.free.fr/transpose_abc.pl"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="examples pango"
-
-RDEPEND="pango? ( x11-libs/pango media-libs/freetype:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--enable-a4 \
-		--enable-deco-is-roll \
-		$(use_enable pango)
-}
-
-src_install() {
-	dobin abcm2ps
-
-	insinto /usr/share/${PN}
-	doins *.fmt
-
-	dodoc Changes README *.txt
-
-	if use examples ; then
-		docinto examples
-		dodoc *.{abc,eps}
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	docinto contrib
-	dodoc "${DISTDIR}"/transpose_abc.pl
-}
diff --git a/media-sound/abcm2ps/abcm2ps-8.8.3.ebuild b/media-sound/abcm2ps/abcm2ps-8.12.1.ebuild
similarity index 94%
rename from media-sound/abcm2ps/abcm2ps-8.8.3.ebuild
rename to media-sound/abcm2ps/abcm2ps-8.12.1.ebuild
index d6c38320df21..ab13763bc47c 100644
--- a/media-sound/abcm2ps/abcm2ps-8.8.3.ebuild
+++ b/media-sound/abcm2ps/abcm2ps-8.12.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="A program to convert abc files to Postscript files"
diff --git a/media-sound/abcm2ps/abcm2ps-8.5.2.ebuild b/media-sound/abcm2ps/abcm2ps-8.5.2.ebuild
deleted file mode 100644
index 86e11a877ff6..000000000000
--- a/media-sound/abcm2ps/abcm2ps-8.5.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="A program to convert abc files to Postscript files"
-HOMEPAGE="http://moinejf.free.fr/"
-SRC_URI="http://moinejf.free.fr/${P}.tar.gz
-	http://moinejf.free.fr/transpose_abc.pl"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="examples pango"
-
-RDEPEND="pango? ( x11-libs/pango media-libs/freetype:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--enable-a4 \
-		--enable-deco-is-roll \
-		$(use_enable pango)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin abcm2ps
-
-	insinto /usr/share/${PN}
-	doins *.fmt
-
-	dodoc Changes README *.txt
-
-	if use examples ; then
-		docinto examples
-		dodoc *.{abc,eps}
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	docinto contrib
-	dodoc "${DISTDIR}"/transpose_abc.pl
-}
diff --git a/media-sound/abcm2ps/abcm2ps-8.8.4.ebuild b/media-sound/abcm2ps/abcm2ps-8.8.4.ebuild
index d6c38320df21..86e11a877ff6 100644
--- a/media-sound/abcm2ps/abcm2ps-8.8.4.ebuild
+++ b/media-sound/abcm2ps/abcm2ps-8.8.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://moinejf.free.fr/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="examples pango"
 
 RDEPEND="pango? ( x11-libs/pango media-libs/freetype:2 )"
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index c9506b1f3860..fc2c3a796b74 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,2 +1,3 @@
 DIST abcMIDI-2015-08-25.zip 665906 SHA256 614d8e7bac0d9092e08b69ec79066fe202e0dd5dd79a2d99b16e88dcda9f7c31 SHA512 2253d13611c41d2faff6393497f15dbbda583ff99093df6c368942ce2227ac22f2c0f84a33eb96ba7e6553325c6363dd9f550d432571a253f83e9a94cd0ed12b WHIRLPOOL b36e3af032f298954630e3adc25397054c4b5c2ddde42b48d2bb92736f91b8a1ad6814446d9acb8688021ea743bd2d24c532702e54c1b1e59c5dfc227561a154
 DIST abcMIDI-2016.05.05.zip 671937 SHA256 6000e11172552c3eb0194267c1acadca620514bd35e141978f85bc4ec47aa22b SHA512 c3525ea399a5b71d7d0604cb04334e07e8d92613cd62313c8500143ed776a49c45b6ee22dd251d35a690b774ec807a2a8ba4533d81d33b1c146c3233d163aba0 WHIRLPOOL 3ef0ec16df40ae1dadbbda9b78c7561f29de394b70eaba950f6a0ad1cbf0f71060b64f273fe3f40c6c58a731f380b5791e9cc9afa702558152f35d3073f4bc2b
+DIST abcMIDI-2016.07.20.zip 672095 SHA256 a5539c2c3b3b23aec75ac2b9bafa79ea26e70cc0de021096f021e47a0641e75e SHA512 414ea0386747f26e3d1dabd5960e5f46e0da26e818671bfcf31621be9a60caf41ef49069ccff021a416125cbc2fe5cb4a61d60b579b03f5d6463408a63c0522f WHIRLPOOL 3a02f8349eaf27a854534fd48555ef12d572fd0c934aa347b00453e95969952fd8854286027a286ab71d9143d1c69f8545b6b4562668bbd385ed4d9915544015
diff --git a/media-sound/abcmidi/abcmidi-2016.07.20.ebuild b/media-sound/abcmidi/abcmidi-2016.07.20.ebuild
new file mode 100644
index 000000000000..9d2ae4c6fd16
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2016.07.20.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+MY_P="abcMIDI-${PV}"
+DESCRIPTION="Programs for processing ABC music notation files"
+HOMEPAGE="http://ifdo.ca/~seymour/runabc/top.html"
+SRC_URI="http://ifdo.ca/~seymour/runabc/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}"/${PN}-2016.05.05-docs.patch )
+	default
+
+	rm configure makefile || die
+	sed -i "s:-O2::" configure.ac || die
+
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
+
+	if use examples ; then
+		docinto examples
+		dodoc samples/*.abc
+	fi
+}
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index dd9b0f940b54..a80e41e4dae6 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,2 +1,2 @@
 DIST lilypond-2.18.2.tar.gz 16027977 SHA256 329d733765b0ba7be1878ae3f457dbbb875cc2840d2b75af4afc48c9454fba07 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6 WHIRLPOOL 95db264992a1e425fd1ee53d980941eef554c1784a1adfc105750d82d11664f61207c2b1897b6e99448790131c0715f08401f45b663c420553925596c6fd4b1c
-DIST lilypond-2.19.42.tar.gz 16870150 SHA256 f925284e994a67712c9d57437f2ff4329a987793e071d6944bdf32d762b81c8c SHA512 2f94656f20bae50797985657c0e557aca793044c8b9ae137ee6bbdee60cb4aa72cca0988d8ae19bf24cc4948d2ba73cb87ce9530a746daeb93632e0092ea5acf WHIRLPOOL 887f4fa188f999474ab3b3240dafb1130861b38768bfbae18dd2096488bfb645b189ab47563f5d6de0dee81279d6fe84f5d2c9af690db0c0e767cf26dfb1fa72
+DIST lilypond-2.19.46.tar.gz 16899476 SHA256 f609051e2128c40da17698c0432fe8a96858583d197a8264fc4bceeab0378674 SHA512 594921b784f6604bfb2210569fac03911cb5c4c11e2e9241f62153d7c012b5e10cd2cacd3ac3d69c1719c9b6fddc550d381a9fa9b96f22ada63019b38ef95de1 WHIRLPOOL b77b1bc76ccdf6e17179fd9b1497beac96da2bd1ce83b7944a2a8f4a5d6274581c8e7f4c9e2de44b53912df702731456cd2658d96cccb186347f1a4577146a4d
diff --git a/media-sound/lilypond/lilypond-2.18.2-r1.ebuild b/media-sound/lilypond/lilypond-2.18.2-r1.ebuild
deleted file mode 100644
index 65671688c7eb..000000000000
--- a/media-sound/lilypond/lilypond-2.18.2-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit elisp-common autotools eutils python-single-r1
-
-DESCRIPTION="GNU Music Typesetter"
-SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
-HOMEPAGE="http://lilypond.org/"
-
-LICENSE="GPL-3 FDL-1.3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~x86"
-LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
-IUSE="debug emacs profile vim-syntax ${LANGS// / linguas_}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=app-text/ghostscript-gpl-8.15
-	>=dev-scheme/guile-1.8.2:12[deprecated,regex]
-	media-fonts/urw-fonts
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=x11-libs/pango-1.12.3
-	emacs? ( virtual/emacs )
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-text/t1utils
-	dev-lang/perl
-	dev-libs/kpathsea
-	>=dev-texlive/texlive-metapost-2013
-	|| (
-		>=app-text/texlive-core-2013
-		>=dev-tex/metapost-1.803
-	)
-	virtual/pkgconfig
-	media-gfx/fontforge[png]
-	>=sys-apps/texinfo-4.11
-	>=sys-devel/bison-2.0
-	sys-devel/flex
-	sys-devel/gettext
-	sys-devel/make"
-
-# Correct output data for tests isn't bundled with releases
-RESTRICT="test"
-
-pkg_setup() {
-	# make sure >=metapost-1.803 is selected if it's installed, bug 498704
-	if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then
-		if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then
-			einfo "Updating metapost symlink"
-			eselect mpost update || die
-		fi
-	fi
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.17.2-tex-docs.patch
-	epatch "${FILESDIR}"/${P}-fontforge.patch
-
-	if ! use vim-syntax ; then
-		sed -i 's/vim//' GNUmakefile.in || die
-	fi
-
-	# respect CFLAGS
-	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
-
-	for lang in ${LANGS}; do
-		use linguas_${lang} || rm po/${lang}.po || die
-	done
-
-	# respect AR
-	sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die
-
-	# remove bundled texinfo file (fixes bug #448560)
-	rm tex/texinfo.tex || die
-
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	# documentation generation currently not supported since it requires a newer
-	# version of texi2html than is currently in the tree
-
-	econf \
-		--with-ncsb-dir=/usr/share/fonts/urw-fonts \
-		--disable-documentation \
-		--disable-optimising \
-		--disable-pipe \
-		$(use_enable debug debugging) \
-		$(use_enable profile profiling)
-}
-
-src_compile() {
-	default
-
-	if use emacs ; then
-		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
-			|| die "elisp-compile failed"
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
-
-	# remove elisp files since they are in the wrong directory
-	rm -r "${ED}"/usr/share/emacs || die
-
-	if use emacs ; then
-		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
-			|| die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
-	fi
-
-	python_fix_shebang "${ED}"
-
-	dodoc AUTHORS.txt NEWS.txt README.txt
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/media-sound/lilypond/lilypond-2.18.2-r2.ebuild b/media-sound/lilypond/lilypond-2.18.2-r2.ebuild
index e27ca3602f70..4d1100354517 100644
--- a/media-sound/lilypond/lilypond-2.18.2-r2.ebuild
+++ b/media-sound/lilypond/lilypond-2.18.2-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://lilypond.org/"
 
 LICENSE="GPL-3 FDL-1.3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86"
 LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
 IUSE="debug emacs profile vim-syntax ${LANGS// / linguas_}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-sound/lilypond/lilypond-2.19.42.ebuild b/media-sound/lilypond/lilypond-2.19.46.ebuild
similarity index 88%
rename from media-sound/lilypond/lilypond-2.19.42.ebuild
rename to media-sound/lilypond/lilypond-2.19.46.ebuild
index f27ba3673fd5..63535e73399f 100644
--- a/media-sound/lilypond/lilypond-2.19.42.ebuild
+++ b/media-sound/lilypond/lilypond-2.19.46.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" = "9999" ]]; then
 	EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
 else
 	SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~hppa ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86"
 fi
 
 DESCRIPTION="GNU Music Typesetter"
@@ -52,7 +52,7 @@ DEPEND="${RDEPEND}
 # Correct output data for tests isn't bundled with releases
 RESTRICT="test"
 
-DOCS=( README.txt )
+DOCS=( DEDICATION HACKING README.txt ROADMAP )
 
 pkg_setup() {
 	# make sure >=metapost-1.803 is selected if it's installed, bug 498704
@@ -67,6 +67,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
+
 	if ! use vim-syntax ; then
 		sed -i 's/vim//' GNUmakefile.in || die
 	fi
@@ -84,8 +86,6 @@ src_prepare() {
 	# remove bundled texinfo file (fixes bug #448560)
 	rm tex/texinfo.tex || die
 
-	eapply_user
-
 	eautoreconf
 }
 
@@ -93,13 +93,18 @@ src_configure() {
 	# documentation generation currently not supported since it requires a newer
 	# version of texi2html than is currently in the tree
 
-	econf \
-		--with-texgyre-dir=/usr/share/fonts/tex-gyre \
-		--disable-documentation \
-		--disable-optimising \
-		--disable-pipe \
-		$(use_enable debug debugging) \
+	local myeconfargs+=(
+		--with-texgyre-dir=/usr/share/fonts/tex-gyre
+		--disable-documentation
+		--disable-optimising
+		--disable-pipe
+		$(use_enable debug debugging)
 		$(use_enable profile profiling)
+	)
+
+	has_version ">=dev-scheme/guile-2" && myeconfargs+=( --enable-guile2 )
+
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index f27ba3673fd5..2a3aaafdadd4 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -52,7 +52,7 @@ DEPEND="${RDEPEND}
 # Correct output data for tests isn't bundled with releases
 RESTRICT="test"
 
-DOCS=( README.txt )
+DOCS=( DEDICATION HACKING README.txt ROADMAP )
 
 pkg_setup() {
 	# make sure >=metapost-1.803 is selected if it's installed, bug 498704
@@ -67,6 +67,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	default
+
 	if ! use vim-syntax ; then
 		sed -i 's/vim//' GNUmakefile.in || die
 	fi
@@ -84,8 +86,6 @@ src_prepare() {
 	# remove bundled texinfo file (fixes bug #448560)
 	rm tex/texinfo.tex || die
 
-	eapply_user
-
 	eautoreconf
 }
 
@@ -93,13 +93,18 @@ src_configure() {
 	# documentation generation currently not supported since it requires a newer
 	# version of texi2html than is currently in the tree
 
-	econf \
-		--with-texgyre-dir=/usr/share/fonts/tex-gyre \
-		--disable-documentation \
-		--disable-optimising \
-		--disable-pipe \
-		$(use_enable debug debugging) \
+	local myeconfargs+=(
+		--with-texgyre-dir=/usr/share/fonts/tex-gyre
+		--disable-documentation
+		--disable-optimising
+		--disable-pipe
+		$(use_enable debug debugging)
 		$(use_enable profile profiling)
+	)
+
+	has_version ">=dev-scheme/guile-2" && myeconfargs+=( --enable-guile2 )
+
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index f79d7db01911..2e98c406cc63 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,3 +1,3 @@
-DIST ncmpcpp-0.7.3.tar.bz2 442209 SHA256 2c8b29435ca4fd845400cee7c9fd50a731bee215e92fd7e98a7446c84136b212 SHA512 6314b97f36014ade92b3a73640bf529625d75d20a68fb9b2999de579095e37c46e1951b22b0a849bd8e23998e72cfa77f717cff914b7e20dccc0a918cb739732 WHIRLPOOL f50986be48ee8032295da6b9b806e03762f574f889ebcb2b9e54aeb0ab8fbf372cb2d79152e37c870e4a39f27030087146bc14ba5d03ea20bbe87dd52e35eaf0
 DIST ncmpcpp-0.7.4.tar.bz2 442743 SHA256 d70425f1dfab074a12a206ddd8f37f663bce2bbdc0a20f7ecf290ebe051f1e63 SHA512 e5171bd095baefcdf1da1e4d3de3d14a22035584da9b7ec9f176c0fb32bee61a25d989c3405711e512333b10f38a5575e90ec733afeaf7aff995386396f3b918 WHIRLPOOL 57f771c83bbd9afcbeb8b7b8b7a50f0e3fbc95eb74b1ad6b199358431f5f80ed891d1c27902369cf29f9a29622fe88a83aa2fcf7053e0543afb7c23486413999
+DIST ncmpcpp-0.7.5.tar.bz2 443072 SHA256 7e4f643020b36698462879013a8b16111f8c3a4c5819cf186aed78032a41e07d SHA512 5f3b370a5a8fdc05e85a7b748debd960c0e76d5b9e43717efceaa985baa0c543d14d8b0fd7b09550111bff3aa66ec290d6cd2c0ec21de7a0caa10df1c68c99c8 WHIRLPOOL c9fb96f91f308d9937bc832a85cc50293aedcb6fb2eb62e879d08f6ee334b2bb131bbeecd83608fe050c00a3facf025070d8c586796a4a05bc70665e53b47c19
 DIST ncmpcpp-0.7.tar.bz2 442319 SHA256 50924ff0502c9b90ce1b679638769122defd03bc85eb8a95924c62c8d303ff77 SHA512 00477a9044e46c5d0ce4687b16d59d81fc31323a9c23eeebb6701e20c2fe3c50e3e56030844b68bdcf319af04c1f1a3bd50d0732cc9b4614488a918165c2f112 WHIRLPOOL 2bc6ba5935bef72e46b568a98f49a87720d48c0d9699ab35abf3f2f7ed250bc331fc165372d3f352ed5f16ae16da614c3b6c1c6e309a2d1b8d94abefb5e66a0b
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.7.3-r1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.7.5.ebuild
similarity index 93%
rename from media-sound/ncmpcpp/ncmpcpp-0.7.3-r1.ebuild
rename to media-sound/ncmpcpp/ncmpcpp-0.7.5.ebuild
index 2356397b0f77..18f1f28a4e23 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.7.3-r1.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -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 e3ca09c6c58a..ffed7c03bc76 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 18 Aug 2016 20:40:37 +0000
+Fri, 19 Aug 2016 05:40:41 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index e3ca09c6c58a..ffed7c03bc76 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 18 Aug 2016 20:40:37 +0000
+Fri, 19 Aug 2016 05:40:41 +0000
diff --git a/metadata/md5-cache/app-crypt/gnupg-1.4.21 b/metadata/md5-cache/app-crypt/gnupg-1.4.21
index e75df86260f2..d44f8fae479b 100644
--- a/metadata/md5-cache/app-crypt/gnupg-1.4.21
+++ b/metadata/md5-cache/app-crypt/gnupg-1.4.21
@@ -4,10 +4,10 @@ DESCRIPTION=The GNU Privacy Guard, a GPL pgp replacement
 EAPI=5
 HOMEPAGE=http://www.gnupg.org/
 IUSE=bzip2 curl ldap mta nls readline selinux smartcard static usb zlib
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=!static? ( ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) curl? ( net-misc/curl ) mta? ( virtual/mta ) readline? ( sys-libs/readline:0= ) smartcard? ( =virtual/libusb-0* ) usb? ( =virtual/libusb-0* ) ) selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-1.4.21.tar.bz2
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=05a90cc6aeee7e329dc50d20971046b0
+_md5_=7a90b69e7ccdc6d6cfcd568972cd3f04
diff --git a/metadata/md5-cache/app-emulation/cloud-init-0.7.7 b/metadata/md5-cache/app-emulation/cloud-init-0.7.7
new file mode 100644
index 000000000000..3b59a9a5e889
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/cloud-init-0.7.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/jsonpatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/oauthlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/prettytable[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyserial[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/httpretty-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pep8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flake8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/hacking[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-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_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_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/pkgconfig
+DESCRIPTION=cloud initialisation magic
+EAPI=6
+HOMEPAGE=https://launchpad.net/cloud-init
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/jsonpatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/oauthlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/prettytable[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyserial[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-apps/iproute2 sys-fs/growpart virtual/logger python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://gentoo/cloud-init-0.7.7.tar.gz http://dev.gentoo.org/~prometheanfire/dist/cloud-init/cloud-init-0.7.7.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=2fbe165d9ee0f04cd79ea382a07b2a1e
diff --git a/metadata/md5-cache/app-misc/byobu-5.111 b/metadata/md5-cache/app-misc/byobu-5.111
new file mode 100644
index 000000000000..487d3715d9ac
--- /dev/null
+++ b/metadata/md5-cache/app-misc/byobu-5.111
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DESCRIPTION=A set of profiles for the GNU Screen console window manager (app-misc/screen)
+EAPI=6
+HOMEPAGE=http://byobu.co
+IUSE=screen python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-libs/newt[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] screen? ( app-misc/screen ) !screen? ( app-misc/tmux )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://launchpad.net/byobu/trunk/5.111/+download/byobu_5.111.orig.tar.gz
+_eclasses_=multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=7ec0f2a96f2c5690636aa03037896fb8
diff --git a/metadata/md5-cache/app-misc/when-1.1.36 b/metadata/md5-cache/app-misc/when-1.1.36
new file mode 100644
index 000000000000..b40415267a2c
--- /dev/null
+++ b/metadata/md5-cache/app-misc/when-1.1.36
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Extremely simple personal calendar program aimed at the Unix geek who wants something minimalistic
+EAPI=6
+HOMEPAGE=http://www.lightandmatter.com/when/when.html
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=Artistic
+RDEPEND=dev-lang/perl
+SLOT=0
+SRC_URI=http://www.lightandmatter.com/when/when.tar.gz -> when-1.1.36.tar.gz
+_md5_=eb259edc5d30f8cf88a1b11b1140eb20
diff --git a/metadata/md5-cache/dev-db/percona-toolkit-2.2.15 b/metadata/md5-cache/dev-db/percona-toolkit-2.2.15
deleted file mode 100644
index 9d352f1962fd..000000000000
--- a/metadata/md5-cache/dev-db/percona-toolkit-2.2.15
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-perl/DBI dev-perl/DBD-mysql virtual/perl-Time-HiRes virtual/perl-ExtUtils-MakeMaker dev-lang/perl[-build(-)] dev-lang/perl[-build(-)]
-DESCRIPTION=essential command-line utilities for MySQL
-EAPI=5
-HOMEPAGE=http://www.percona.com/software/percona-toolkit/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2 Artistic )
-RDEPEND=dev-perl/DBI dev-perl/DBD-mysql virtual/perl-Time-HiRes dev-perl/JSON dev-perl/libwww-perl dev-perl/Role-Tiny virtual/perl-File-Path virtual/perl-Getopt-Long virtual/perl-Time-Local virtual/perl-Digest-MD5 virtual/perl-IO-Compress virtual/perl-File-Temp virtual/perl-File-Spec virtual/perl-Scalar-List-Utils dev-perl/TermReadKey dev-lang/perl[-build(-)] dev-lang/perl[-build(-)]
-SLOT=0
-SRC_URI=http://www.percona.com/downloads/percona-toolkit/2.2.15/tarball/percona-toolkit-2.2.15.tar.gz
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-app	11f61997f1d4923276dd72a750617c7d	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=3559490303c3b7dc84bcb50e9f70e48d
diff --git a/metadata/md5-cache/dev-db/percona-toolkit-2.2.19 b/metadata/md5-cache/dev-db/percona-toolkit-2.2.19
new file mode 100644
index 000000000000..c4b7280e7a40
--- /dev/null
+++ b/metadata/md5-cache/dev-db/percona-toolkit-2.2.19
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/DBI dev-perl/DBD-mysql virtual/perl-Time-HiRes virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Advanced command-line tools to perform a variety of MySQL and system tasks
+EAPI=6
+HOMEPAGE=https://www.percona.com/software/mysql-tools/percona-toolkit
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2 Artistic )
+RDEPEND=dev-perl/DBI dev-perl/DBD-mysql virtual/perl-Time-HiRes dev-perl/JSON dev-perl/libwww-perl dev-perl/Role-Tiny virtual/perl-File-Path virtual/perl-Getopt-Long virtual/perl-Time-Local virtual/perl-Digest-MD5 virtual/perl-IO-Compress virtual/perl-File-Temp virtual/perl-File-Spec virtual/perl-Scalar-List-Utils dev-perl/TermReadKey dev-lang/perl:=
+SLOT=0
+SRC_URI=https://www.percona.com/downloads/percona-toolkit/2.2.19/tarball/percona-toolkit-2.2.19.tar.gz
+_eclasses_=multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce
+_md5_=be0bbed0ae6412d49366d40045873b62
diff --git a/metadata/md5-cache/dev-db/xtrabackup-bin-2.2.5 b/metadata/md5-cache/dev-db/xtrabackup-bin-2.2.5
deleted file mode 100644
index 30420d89d633..000000000000
--- a/metadata/md5-cache/dev-db/xtrabackup-bin-2.2.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare unpack
-DESCRIPTION=MySQL hot backup software that performs non-blocking backups for InnoDB and XtraDB databases
-EAPI=5
-HOMEPAGE=http://www.percona.com/software/percona-xtrabackup
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio dev-libs/libgcrypt:11/11 dev-libs/libgpg-error dev-perl/DBD-mysql sys-libs/zlib
-SLOT=0
-SRC_URI=amd64? ( http://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.2.5/binary/tarball/percona-xtrabackup-2.2.5-5027-Linux-x86_64.tar.gz ) x86? ( http://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.2.5/binary/tarball/percona-xtrabackup-2.2.5-5027-Linux-i686.tar.gz )
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=f1f4152bdc623430554a02b72d20f9a2
diff --git a/metadata/md5-cache/dev-db/xtrabackup-bin-2.4.1 b/metadata/md5-cache/dev-db/xtrabackup-bin-2.4.4
similarity index 76%
rename from metadata/md5-cache/dev-db/xtrabackup-bin-2.4.1
rename to metadata/md5-cache/dev-db/xtrabackup-bin-2.4.4
index a4ddc92ccd28..67f72ba2fc4a 100644
--- a/metadata/md5-cache/dev-db/xtrabackup-bin-2.4.1
+++ b/metadata/md5-cache/dev-db/xtrabackup-bin-2.4.4
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libaio dev-libs/libgcrypt:11/11 dev-libs/libgpg-error dev-perl/DBD-mysql sys-libs/zlib
 SLOT=0
-SRC_URI=amd64? ( http://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.4.1/binary/tarball/percona-xtrabackup-2.4.1-Linux-x86_64.tar.gz ) x86? ( http://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.4.1/binary/tarball/percona-xtrabackup-2.4.1-Linux-i686.tar.gz )
+SRC_URI=amd64? ( http://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.4.4/binary/tarball/percona-xtrabackup-2.4.4-Linux-x86_64.tar.gz ) x86? ( http://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-2.4.4/binary/tarball/percona-xtrabackup-2.4.4-Linux-i686.tar.gz )
 _md5_=5fedf6ba376d092864801c38df2d7364
diff --git a/metadata/md5-cache/dev-lang/python-2.7.10-r1 b/metadata/md5-cache/dev-lang/python-2.7.10-r1
index 5ae3ea57cdc2..290cfe56c937 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.10-r1
+++ b/metadata/md5-cache/dev-lang/python-2.7.10-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl xml? ( >=dev-libs/expat-2.1 ) !build? ( berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) ) !!<sys-apps/portage-2.1.9 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
+DEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl xml? ( >=dev-libs/expat-2.1 ) !build? ( berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) ) !!<sys-apps/portage-2.1.9 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=4
 HOMEPAGE=http://www.python.org/
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl xml?
 SLOT=2.7
 SRC_URI=http://www.python.org/ftp/python/2.7.10/Python-2.7.10.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.10-0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=950a20d6c8a7d8ab3f8109286d0ab950
+_md5_=fdcc2aad6e0328be066a44f38947800f
diff --git a/metadata/md5-cache/dev-lang/python-2.7.11-r2 b/metadata/md5-cache/dev-lang/python-2.7.11-r2
index b85d7e2dece6..58510ada6b48 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.11-r2
+++ b/metadata/md5-cache/dev-lang/python-2.7.11-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) !!<sys-apps/portage-2.1.9 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
+DEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) !!<sys-apps/portage-2.1.9 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=http://www.python.org/
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libint
 SLOT=2.7
 SRC_URI=http://www.python.org/ftp/python/2.7.11/Python-2.7.11.tar.xz https://dev.gentoo.org/~djc/python-gentoo-patches-2.7.11-0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=8fc129ba01378d97d1bd29246d424904
+_md5_=2c22b4ff8a76f73546727441f3207280
diff --git a/metadata/md5-cache/dev-lang/python-2.7.12 b/metadata/md5-cache/dev-lang/python-2.7.12
index 26a8a9c74e73..ed7dee41ef5d 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.12
+++ b/metadata/md5-cache/dev-lang/python-2.7.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) !!<sys-apps/portage-2.1.9 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
+DEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) !!<sys-apps/portage-2.1.9 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=http://www.python.org/
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libint
 SLOT=2.7
 SRC_URI=https://www.python.org/ftp/python/2.7.12/Python-2.7.12.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.12-0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=fb918e74e49045cd5a687dc302b2770a
+_md5_=5e16cad317729ed744c9632b6b4d970f
diff --git a/metadata/md5-cache/dev-lang/python-3.3.5-r3 b/metadata/md5-cache/dev-lang/python-3.3.5-r3
index 268614ecc905..f01007fa63f8 100644
--- a/metadata/md5-cache/dev-lang/python-3.3.5-r3
+++ b/metadata/md5-cache/dev-lang/python-3.3.5-r3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2 app-arch/xz-utils >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69
+DEPEND=app-arch/bzip2 app-arch/xz-utils >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=4
 HOMEPAGE=http://www.python.org/
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2 app-arch/xz-utils >=sys-libs/zlib-1.1.3 virtual/libffi vi
 SLOT=3.3
 SRC_URI=http://www.python.org/ftp/python/3.3.5/Python-3.3.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.3.5-0.tar.xz mirror://gentoo/python-gentoo-patches-3.3.5-0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=d96c2cb1b44d22a6f92a94b41ca026ae
+_md5_=6525aa28caca060b51671290d262c967
diff --git a/metadata/md5-cache/dev-lang/python-3.3.5-r8 b/metadata/md5-cache/dev-lang/python-3.3.5-r8
index 16ff12676cd7..7bf17377cc3c 100644
--- a/metadata/md5-cache/dev-lang/python-3.3.5-r8
+++ b/metadata/md5-cache/dev-lang/python-3.3.5-r8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] !<sys-devel/gettext-0.18.1.1-r3 sys-devel/automake >=sys-devel/autoconf-2.69
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=http://www.python.org/
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/
 SLOT=3.3/3.3m
 SRC_URI=http://www.python.org/ftp/python/3.3.5/Python-3.3.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.3.5-0.tar.xz mirror://gentoo/python-gentoo-patches-3.3.5-0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=42819297a145379208156cb330c0fcfd
+_md5_=d6fd95bf9f6d4c8100f02998aadc7566
diff --git a/metadata/md5-cache/dev-lang/python-3.4.3-r1 b/metadata/md5-cache/dev-lang/python-3.4.3-r1
index 9364ae322ec2..785210fd9643 100644
--- a/metadata/md5-cache/dev-lang/python-3.4.3-r1
+++ b/metadata/md5-cache/dev-lang/python-3.4.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2 app-arch/xz-utils >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl xml? ( >=dev-libs/expat-2.1 ) !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
+DEPEND=app-arch/bzip2 app-arch/xz-utils >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl xml? ( >=dev-libs/expat-2.1 ) !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt dev-tcltk/tix ) ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=4
 HOMEPAGE=http://www.python.org/
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2 app-arch/xz-utils >=sys-libs/zlib-1.1.3 virtual/libffi vi
 SLOT=3.4
 SRC_URI=http://www.python.org/ftp/python/3.4.3/Python-3.4.3.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.4.3-0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=e4f7eebc5aae7bc40741d2c5a9375fec
+_md5_=97d99ac16d3f3e5378976ba0bb362eed
diff --git a/metadata/md5-cache/dev-lang/python-3.4.3-r7 b/metadata/md5-cache/dev-lang/python-3.4.3-r7
index d6b9f2ac2801..91fe62b3bb9a 100644
--- a/metadata/md5-cache/dev-lang/python-3.4.3-r7
+++ b/metadata/md5-cache/dev-lang/python-3.4.3-r7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=http://www.python.org/
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/
 SLOT=3.4/3.4m
 SRC_URI=http://www.python.org/ftp/python/3.4.3/Python-3.4.3.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.4.3-0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=7c1a98451c902a1e10d1d433047da52c
+_md5_=50615d38bdaa4e101cc39ffff638f146
diff --git a/metadata/md5-cache/dev-lang/python-3.4.4 b/metadata/md5-cache/dev-lang/python-3.4.4
index 70579d9bb1c6..8f6fd64b8284 100644
--- a/metadata/md5-cache/dev-lang/python-3.4.4
+++ b/metadata/md5-cache/dev-lang/python-3.4.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=http://www.python.org/
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/
 SLOT=3.4/3.4m
 SRC_URI=http://www.python.org/ftp/python/3.4.4/Python-3.4.4.tar.xz https://dev.gentoo.org/~mgorny/dist/python-gentoo-patches-3.4.4-0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=8b962a4a78bfcea117a6dbe8db017ab4
+_md5_=bd41b6fcb34ad82b41724133a6114e39
diff --git a/metadata/md5-cache/dev-lang/python-3.4.5 b/metadata/md5-cache/dev-lang/python-3.4.5
index 95cc197f06aa..8540e4a84f9e 100644
--- a/metadata/md5-cache/dev-lang/python-3.4.5
+++ b/metadata/md5-cache/dev-lang/python-3.4.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69
 DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=http://www.python.org/
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= >=sys-libs/zlib-1.1.3:0= virtual/
 SLOT=3.4/3.4m
 SRC_URI=http://www.python.org/ftp/python/3.4.5/Python-3.4.5.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.4.5-0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=105d23572d4413e89f3e4565f954536e
+_md5_=497fa229354ef300d51e148d5ef393eb
diff --git a/metadata/md5-cache/dev-libs/cdk-5.0.20150928 b/metadata/md5-cache/dev-libs/cdk-5.0.20150928
new file mode 100644
index 000000000000..75129ed70eef
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/cdk-5.0.20150928
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=>=sys-libs/ncurses-5.2:0=[unicode?]
+DESCRIPTION=A library of curses widgets
+EAPI=6
+HOMEPAGE=http://dickey.his.com/cdk/cdk.html
+IUSE=examples static-libs unicode
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=BSD
+RDEPEND=>=sys-libs/ncurses-5.2:0=[unicode?]
+SLOT=0/6
+SRC_URI=ftp://invisible-island.net/cdk/cdk-5.0-20150928.tgz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=b2de690816df84d9f98a94cc02192089
diff --git a/metadata/md5-cache/dev-libs/fstrm-0.3.0 b/metadata/md5-cache/dev-libs/fstrm-0.3.0
new file mode 100644
index 000000000000..8f93dee852f7
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/fstrm-0.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=utils? ( dev-libs/libevent[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/pkgconfig[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(-)?] !<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=Frame Streams implementation in C
+EAPI=6
+HOMEPAGE=https://github.com/farsightsec/fstrm
+IUSE=static-libs utils 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 ~hppa ~mips ~ppc ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=utils? ( dev-libs/libevent[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
+SRC_URI=https://github.com/farsightsec/fstrm/archive/v0.3.0.tar.gz -> fstrm-0.3.0.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=3c1052fd4437a77f85d8b4577553907c
diff --git a/metadata/md5-cache/dev-libs/libebml-1.3.4 b/metadata/md5-cache/dev-libs/libebml-1.3.4
new file mode 100644
index 000000000000..f9339c042744
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libebml-1.3.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=!<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=Extensible binary format library (kinda like XML)
+EAPI=6
+HOMEPAGE=http://www.matroska.org/ https://github.com/Matroska-Org/libebml/
+IUSE=debug static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=LGPL-2.1
+SLOT=0/4
+SRC_URI=http://dl.matroska.org/downloads/libebml/libebml-1.3.4.tar.bz2
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=d88e66045ad954ccb447ec639e2ab2b4
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.7.3 b/metadata/md5-cache/dev-libs/libgcrypt-1.7.3
index cad0d58de385..292e09cd8c99 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.7.3
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.7.3
@@ -4,10 +4,10 @@ DESCRIPTION=General purpose crypto library based on the code used in GnuPG
 EAPI=5
 HOMEPAGE=http://www.gnupg.org/
 IUSE=doc 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.12[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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.7.3.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=2d66345ec0734d956ecdd489988b8284
+_md5_=b9dee34d0629eff74b7352b88dc44f50
diff --git a/metadata/md5-cache/dev-python/billiard-3.5.0.0 b/metadata/md5-cache/dev-python/billiard-3.5.0.0
new file mode 100644
index 000000000000..144d31f88115
--- /dev/null
+++ b/metadata/md5-cache/dev-python/billiard-3.5.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( dev-python/case[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/unittest2-0.4.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/nose-1.3.4[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/nose-cover3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_pypy? ( dev-python/mock[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( dev-python/mock[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/mock[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3: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 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Python multiprocessing fork
+EAPI=6
+HOMEPAGE=https://pypi.python.org/pypi/billiard https://github.com/celery/billiard
+IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3: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 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/b/billiard/billiard-3.5.0.0.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=08013b8593523b0092e413a096fc406b
diff --git a/metadata/md5-cache/dev-python/case-1.2.3 b/metadata/md5-cache/dev-python/case-1.2.3
new file mode 100644
index 000000000000..184a302c816c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/case-1.2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3: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 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Python unittest Utilities
+EAPI=6
+HOMEPAGE=https://pypi.python.org/pypi/case https://github.com/celery/case
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3: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 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/c/case/case-1.2.3.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=c382ab2c53834f07e807df0d08d6b615
diff --git a/metadata/md5-cache/dev-python/ijson-1.1 b/metadata/md5-cache/dev-python/ijson-1.1
deleted file mode 100644
index e960cc601821..000000000000
--- a/metadata/md5-cache/dev-python/ijson-1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/yajl 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-DESCRIPTION=Iterative JSON parser with a Pythonic interface
-EAPI=5
-HOMEPAGE=https://github.com/isagalaev/ijson https://pypi.python.org/pypi/ijson/
-IUSE=python_targets_python2_7 python_targets_python3_3
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/yajl 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 )
-SLOT=0
-SRC_URI=mirror://pypi/i/ijson/ijson-1.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f5ca86d99efee46122cfac5439bcd527
diff --git a/metadata/md5-cache/dev-python/ijson-2.0 b/metadata/md5-cache/dev-python/ijson-2.0
deleted file mode 100644
index 982e03e05579..000000000000
--- a/metadata/md5-cache/dev-python/ijson-2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/yajl dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Iterative JSON parser with a Pythonic interface
-EAPI=5
-HOMEPAGE=https://github.com/isagalaev/ijson https://pypi.python.org/pypi/ijson/
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-libs/yajl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/i/ijson/ijson-2.0.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ff70ee1eb4c7c9e1ae84083f1dba37ee
diff --git a/metadata/md5-cache/dev-python/ijson-2.1 b/metadata/md5-cache/dev-python/ijson-2.1
deleted file mode 100644
index 0d1352714eb9..000000000000
--- a/metadata/md5-cache/dev-python/ijson-2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/yajl dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Iterative JSON parser with a Pythonic interface
-EAPI=5
-HOMEPAGE=https://github.com/isagalaev/ijson https://pypi.python.org/pypi/ijson/
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/yajl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/i/ijson/ijson-2.1.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f4df006fb27bac9ee70990c3f59d38d5
diff --git a/metadata/md5-cache/dev-python/ijson-2.2 b/metadata/md5-cache/dev-python/ijson-2.2
deleted file mode 100644
index 78daed12c159..000000000000
--- a/metadata/md5-cache/dev-python/ijson-2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/yajl dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Iterative JSON parser with a Pythonic interface
-EAPI=5
-HOMEPAGE=https://github.com/isagalaev/ijson https://pypi.python.org/pypi/ijson/
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-libs/yajl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
-SLOT=0
-SRC_URI=https://github.com/isagalaev/ijson/archive/2.2.tar.gz -> ijson-2.2.tar.gz
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b13801acf83349b570c5c072306af838
diff --git a/metadata/md5-cache/dev-python/ijson-2.3 b/metadata/md5-cache/dev-python/ijson-2.3
index e2a091eda8e5..455434b0a9ad 100644
--- a/metadata/md5-cache/dev-python/ijson-2.3
+++ b/metadata/md5-cache/dev-python/ijson-2.3
@@ -4,11 +4,11 @@ DESCRIPTION=Iterative JSON parser with a Pythonic interface
 EAPI=5
 HOMEPAGE=https://github.com/isagalaev/ijson https://pypi.python.org/pypi/ijson/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-libs/yajl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=https://github.com/isagalaev/ijson/archive/2.3.tar.gz -> ijson-2.3.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f99b4e52a800e89cec80f5fe9a393d97
+_md5_=68d9503021b2c780a20b6ad57a9dd861
diff --git a/metadata/md5-cache/dev-python/pafy-0.5.2 b/metadata/md5-cache/dev-python/pafy-0.5.2
new file mode 100644
index 000000000000..0bf2445aea57
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pafy-0.5.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Python library to retrieve YouTube content and metadata
+EAPI=6
+HOMEPAGE=http://np1.github.io/pafy/ https://pypi.python.org/pypi/pafy
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=net-misc/youtube-dl[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pafy/pafy-0.5.2.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=93cc519e4d47137e947bf737c82a3df8
diff --git a/metadata/md5-cache/dev-qt/qt-docs-5.6.1_p1 b/metadata/md5-cache/dev-qt/qt-docs-5.6.1_p1
new file mode 100644
index 000000000000..0ad5550b2daa
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qt-docs-5.6.1_p1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/p7zip
+DESCRIPTION=Documentation for Qt5, for use with Qt Creator and other tools
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+KEYWORDS=amd64 x86
+LICENSE=FDL-1.3
+SLOT=5
+SRC_URI=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_56_src_doc_examples/qt.56.doc/5.6.1-1qt-everywhere-documentation-5.6.1.7z
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=9128160459966178880bb7b3f02b0817
diff --git a/metadata/md5-cache/dev-qt/qt-docs-5.6.1_p0 b/metadata/md5-cache/dev-qt/qt-docs-5.7.0_p1
similarity index 85%
rename from metadata/md5-cache/dev-qt/qt-docs-5.6.1_p0
rename to metadata/md5-cache/dev-qt/qt-docs-5.7.0_p1
index e6d5973a6ae7..52f14dcdc122 100644
--- a/metadata/md5-cache/dev-qt/qt-docs-5.6.1_p0
+++ b/metadata/md5-cache/dev-qt/qt-docs-5.7.0_p1
@@ -6,6 +6,6 @@ HOMEPAGE=https://www.qt.io/
 KEYWORDS=~amd64 ~x86
 LICENSE=FDL-1.3
 SLOT=5
-SRC_URI=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_56_src_doc_examples/qt.56.doc/5.6.1-0qt-everywhere-documentation-5.6.1.7z
+SRC_URI=https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_57_src_doc_examples/qt.57.doc/5.7.0-1qt-everywhere-documentation-5.7.0.7z
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c9b7e397f8f536be402e5f5701dc22fe
diff --git a/metadata/md5-cache/dev-ruby/bson-3.2.4 b/metadata/md5-cache/dev-ruby/bson-3.2.4
deleted file mode 100644
index 444518f962fa..000000000000
--- a/metadata/md5-cache/dev-ruby/bson-3.2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby22] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)
-EAPI=5
-HOMEPAGE=http://www.mongodb.org/
-IUSE=test doc elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64
-LICENSE=APSL-2
-RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=3
-SRC_URI=https://github.com/mongodb/bson-ruby/archive/v3.2.4.tar.gz -> bson-3.2.4.tar.gz
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2f652e9186e29f632c8e5908b92ce939
diff --git a/metadata/md5-cache/dev-ruby/bson-4.1.1 b/metadata/md5-cache/dev-ruby/bson-4.1.1
new file mode 100644
index 000000000000..8b39cd1e4cf1
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/bson-4.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)
+EAPI=5
+HOMEPAGE=http://www.mongodb.org/
+IUSE=test doc elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~amd64
+LICENSE=APSL-2
+RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=4
+SRC_URI=https://github.com/mongodb/bson-ruby/archive/v4.1.1.tar.gz -> bson-4.1.1.tar.gz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=cad12fa9f2346dc6246d67013b92a351
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.5.1 b/metadata/md5-cache/dev-ruby/bunny-2.5.1
new file mode 100644
index 000000000000..4bebd9828300
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/bunny-2.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=Another synchronous Ruby AMQP client
+EAPI=5
+HOMEPAGE=https://github.com/celldee/bunny
+IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.0.1:2[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=mirror://rubygems/bunny-2.5.1.gem
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	ruby-fakegem	836f858624840907bbb6ae6f2c881cb7	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=2d43a9ecacac6060a5feb4056d89fbec
diff --git a/metadata/md5-cache/dev-util/byacc-20160606 b/metadata/md5-cache/dev-util/byacc-20160606
new file mode 100644
index 000000000000..9a65d1894753
--- /dev/null
+++ b/metadata/md5-cache/dev-util/byacc-20160606
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure
+DESCRIPTION=the best variant of the Yacc parser generator
+EAPI=5
+HOMEPAGE=http://invisible-island.net/byacc/byacc.html
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=public-domain
+SLOT=0
+SRC_URI=ftp://invisible-island.net/byacc/byacc-20160606.tgz
+_md5_=f912d58b3f2aa4e50a97936810b49fb4
diff --git a/metadata/md5-cache/media-gfx/pngcrush-1.8.4 b/metadata/md5-cache/media-gfx/pngcrush-1.8.4
new file mode 100644
index 000000000000..1036cdbe3453
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/pngcrush-1.8.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install setup
+DEPEND=system-libs? ( media-libs/libpng:0= sys-libs/zlib:= ) app-arch/xz-utils
+DESCRIPTION=Portable Network Graphics (PNG) optimizing utility
+EAPI=6
+HOMEPAGE=http://pmt.sourceforge.net/pngcrush/
+IUSE=+system-libs
+KEYWORDS=~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=pngcrush
+RDEPEND=system-libs? ( media-libs/libpng:0= sys-libs/zlib:= )
+SLOT=0
+SRC_URI=system-libs? ( mirror://sourceforge/pmt/pngcrush-1.8.4-nolib.tar.xz ) !system-libs? ( mirror://sourceforge/pmt/pngcrush-1.8.4.tar.xz )
+_eclasses_=multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=bc629c5399cb3f623427f28599168637
diff --git a/metadata/md5-cache/media-libs/libmatroska-1.4.5 b/metadata/md5-cache/media-libs/libmatroska-1.4.5
new file mode 100644
index 000000000000..8c09134f5191
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libmatroska-1.4.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/libebml-1.3.4:= virtual/pkgconfig
+DESCRIPTION=Extensible multimedia container format based on EBML
+EAPI=6
+HOMEPAGE=http://www.matroska.org/ https://github.com/Matroska-Org/libmatroska/
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libebml-1.3.4:=
+SLOT=0/6
+SRC_URI=http://dl.matroska.org/downloads/libmatroska/libmatroska-1.4.5.tar.bz2
+_md5_=726b6f2412e2b967a3c839d36798ece4
diff --git a/metadata/md5-cache/media-sound/abcm2ps-6.6.22 b/metadata/md5-cache/media-sound/abcm2ps-6.6.22
deleted file mode 100644
index eb267b21a74a..000000000000
--- a/metadata/md5-cache/media-sound/abcm2ps-6.6.22
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=pango? ( x11-libs/pango media-libs/freetype:2 ) virtual/pkgconfig
-DESCRIPTION=A program to convert abc files to Postscript files
-EAPI=5
-HOMEPAGE=http://moinejf.free.fr/
-IUSE=examples pango
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=pango? ( x11-libs/pango media-libs/freetype:2 )
-SLOT=0
-SRC_URI=http://moinejf.free.fr/abcm2ps-6.6.22.tar.gz http://moinejf.free.fr/transpose_abc.pl
-_md5_=69a877142149e6f6c0aeb2837c164114
diff --git a/metadata/md5-cache/media-sound/abcm2ps-8.8.3 b/metadata/md5-cache/media-sound/abcm2ps-8.12.1
similarity index 75%
rename from metadata/md5-cache/media-sound/abcm2ps-8.8.3
rename to metadata/md5-cache/media-sound/abcm2ps-8.12.1
index fcbb678ba061..c98aa0a31d34 100644
--- a/metadata/md5-cache/media-sound/abcm2ps-8.8.3
+++ b/metadata/md5-cache/media-sound/abcm2ps-8.12.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install
 DEPEND=pango? ( x11-libs/pango media-libs/freetype:2 ) virtual/pkgconfig
 DESCRIPTION=A program to convert abc files to Postscript files
-EAPI=5
+EAPI=6
 HOMEPAGE=http://moinejf.free.fr/
 IUSE=examples pango
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=pango? ( x11-libs/pango media-libs/freetype:2 )
 SLOT=0
-SRC_URI=http://moinejf.free.fr/abcm2ps-8.8.3.tar.gz http://moinejf.free.fr/transpose_abc.pl
+SRC_URI=http://moinejf.free.fr/abcm2ps-8.12.1.tar.gz http://moinejf.free.fr/transpose_abc.pl
 _eclasses_=multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=efb2e8102603860e67716263708dd1b1
+_md5_=f3f1883d57a825046050da3982a4dab8
diff --git a/metadata/md5-cache/media-sound/abcm2ps-8.5.2 b/metadata/md5-cache/media-sound/abcm2ps-8.5.2
deleted file mode 100644
index 4534bf58881f..000000000000
--- a/metadata/md5-cache/media-sound/abcm2ps-8.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=pango? ( x11-libs/pango media-libs/freetype:2 ) virtual/pkgconfig
-DESCRIPTION=A program to convert abc files to Postscript files
-EAPI=5
-HOMEPAGE=http://moinejf.free.fr/
-IUSE=examples pango
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=pango? ( x11-libs/pango media-libs/freetype:2 )
-SLOT=0
-SRC_URI=http://moinejf.free.fr/abcm2ps-8.5.2.tar.gz http://moinejf.free.fr/transpose_abc.pl
-_eclasses_=multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=7d3789ca7335df1177505239e303ad02
diff --git a/metadata/md5-cache/media-sound/abcm2ps-8.8.4 b/metadata/md5-cache/media-sound/abcm2ps-8.8.4
index c97eec0054d7..aa21a3c47d1d 100644
--- a/metadata/md5-cache/media-sound/abcm2ps-8.8.4
+++ b/metadata/md5-cache/media-sound/abcm2ps-8.8.4
@@ -4,10 +4,10 @@ DESCRIPTION=A program to convert abc files to Postscript files
 EAPI=5
 HOMEPAGE=http://moinejf.free.fr/
 IUSE=examples pango
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=pango? ( x11-libs/pango media-libs/freetype:2 )
 SLOT=0
 SRC_URI=http://moinejf.free.fr/abcm2ps-8.8.4.tar.gz http://moinejf.free.fr/transpose_abc.pl
 _eclasses_=multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=efb2e8102603860e67716263708dd1b1
+_md5_=7d3789ca7335df1177505239e303ad02
diff --git a/metadata/md5-cache/media-sound/abcmidi-2016.07.20 b/metadata/md5-cache/media-sound/abcmidi-2016.07.20
new file mode 100644
index 000000000000..d6ab381674a9
--- /dev/null
+++ b/metadata/md5-cache/media-sound/abcmidi-2016.07.20
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=app-arch/unzip !<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=Programs for processing ABC music notation files
+EAPI=6
+HOMEPAGE=http://ifdo.ca/~seymour/runabc/top.html
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://ifdo.ca/~seymour/runabc/abcMIDI-2016.07.20.zip
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=9e29ff1f0b4bf45762f3da6ea5dbd5b4
diff --git a/metadata/md5-cache/media-sound/lilypond-2.18.2-r1 b/metadata/md5-cache/media-sound/lilypond-2.18.2-r1
deleted file mode 100644
index df38c6583820..000000000000
--- a/metadata/md5-cache/media-sound/lilypond-2.18.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup
-DEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2:12[deprecated,regex] media-fonts/urw-fonts media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( virtual/emacs ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] app-text/t1utils dev-lang/perl dev-libs/kpathsea >=dev-texlive/texlive-metapost-2013 || ( >=app-text/texlive-core-2013 >=dev-tex/metapost-1.803 ) virtual/pkgconfig media-gfx/fontforge[png] >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex sys-devel/gettext sys-devel/make !<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=GNU Music Typesetter
-EAPI=5
-HOMEPAGE=http://lilypond.org/
-IUSE=debug emacs profile vim-syntax linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_eo linguas_es linguas_fi linguas_fr linguas_it linguas_ja linguas_nl linguas_ru linguas_sv linguas_tr linguas_uk linguas_vi linguas_zh_TW python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~hppa ~x86
-LICENSE=GPL-3 FDL-1.3
-RDEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2:12[deprecated,regex] media-fonts/urw-fonts media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( virtual/emacs ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=http://download.linuxaudio.org/lilypond/sources/v2.18/lilypond-2.18.2.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=eb4b9c9bb933516b7a8c52458444a06b
diff --git a/metadata/md5-cache/media-sound/lilypond-2.18.2-r2 b/metadata/md5-cache/media-sound/lilypond-2.18.2-r2
index 29bf5884066c..4432026710ff 100644
--- a/metadata/md5-cache/media-sound/lilypond-2.18.2-r2
+++ b/metadata/md5-cache/media-sound/lilypond-2.18.2-r2
@@ -4,7 +4,7 @@ DESCRIPTION=GNU Music Typesetter
 EAPI=6
 HOMEPAGE=http://lilypond.org/
 IUSE=debug emacs profile vim-syntax linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_eo linguas_es linguas_fi linguas_fr linguas_it linguas_ja linguas_nl linguas_ru linguas_sv linguas_tr linguas_uk linguas_vi linguas_zh_TW python_targets_python2_7
-KEYWORDS=~amd64 ~hppa ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~x86
 LICENSE=GPL-3 FDL-1.3
 RDEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2:12[deprecated,regex] media-fonts/urw-fonts media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( virtual/emacs ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://download.linuxaudio.org/lilypond/sources/v2.18/lilypond-2.18.2.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=256b1042582fcd307a029c54f46fe9b4
+_md5_=677bdfd538c5fb91a8496a79661e27e2
diff --git a/metadata/md5-cache/media-sound/lilypond-2.19.42 b/metadata/md5-cache/media-sound/lilypond-2.19.46
similarity index 95%
rename from metadata/md5-cache/media-sound/lilypond-2.19.42
rename to metadata/md5-cache/media-sound/lilypond-2.19.46
index 1cb0b60ff125..178ec39a55c6 100644
--- a/metadata/md5-cache/media-sound/lilypond-2.19.42
+++ b/metadata/md5-cache/media-sound/lilypond-2.19.46
@@ -4,12 +4,12 @@ DESCRIPTION=GNU Music Typesetter
 EAPI=6
 HOMEPAGE=http://lilypond.org/
 IUSE=debug emacs profile vim-syntax linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_eo linguas_es linguas_fi linguas_fr linguas_it linguas_ja linguas_nl linguas_ru linguas_sv linguas_tr linguas_uk linguas_vi linguas_zh_TW python_targets_python2_7
-KEYWORDS=~amd64 ~hppa ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~x86
 LICENSE=GPL-3 FDL-1.3
 RDEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2:12[deprecated,regex] media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( virtual/emacs ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
-SRC_URI=http://download.linuxaudio.org/lilypond/sources/v2.19/lilypond-2.19.42.tar.gz
+SRC_URI=http://download.linuxaudio.org/lilypond/sources/v2.19/lilypond-2.19.46.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=2d81ea2cc27d0dc100e82416c75b29f0
+_md5_=efd9eea8df2dba93e982f4440616f6b1
diff --git a/metadata/md5-cache/media-sound/lilypond-9999 b/metadata/md5-cache/media-sound/lilypond-9999
index 6028fa8bd6c8..085b46da25e0 100644
--- a/metadata/md5-cache/media-sound/lilypond-9999
+++ b/metadata/md5-cache/media-sound/lilypond-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=python_targets_python2_7
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	792f83d5ec9536cb5ccef375469d8bde	git-r3	00f60a84fc7b499c99edfe99caea9f95	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=2d81ea2cc27d0dc100e82416c75b29f0
+_md5_=a40cb94ddf244a230e4a8b55fd549b5c
diff --git a/metadata/md5-cache/media-sound/ncmpcpp-0.7.3-r1 b/metadata/md5-cache/media-sound/ncmpcpp-0.7.5
similarity index 86%
rename from metadata/md5-cache/media-sound/ncmpcpp-0.7.3-r1
rename to metadata/md5-cache/media-sound/ncmpcpp-0.7.5
index f870dbc26640..6b04280f0e4b 100644
--- a/metadata/md5-cache/media-sound/ncmpcpp-0.7.3-r1
+++ b/metadata/md5-cache/media-sound/ncmpcpp-0.7.5
@@ -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=!dev-libs/boost:0/1.57.0 >=media-libs/libmpdclient-2.1 dev-libs/boost:=[nls,threads] sys-libs/ncurses:=[unicode?] sys-libs/readline:* curl? ( net-misc/curl ) taglib? ( media-libs/taglib ) unicode? ( dev-libs/boost:=[icu] dev-libs/icu:= ) visualizer? ( sci-libs/fftw:3.0= )
 SLOT=0
-SRC_URI=http://ncmpcpp.rybczak.net/stable/ncmpcpp-0.7.3.tar.bz2
+SRC_URI=http://ncmpcpp.rybczak.net/stable/ncmpcpp-0.7.5.tar.bz2
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=5e5498856e3eec115302b8044de97721
+_md5_=4a4ee2a11d70344d3a5c223e43b59adb
diff --git a/metadata/md5-cache/net-firewall/iptables-1.6.0 b/metadata/md5-cache/net-firewall/iptables-1.6.0-r1
similarity index 96%
rename from metadata/md5-cache/net-firewall/iptables-1.6.0
rename to metadata/md5-cache/net-firewall/iptables-1.6.0-r1
index 3861ea1a3703..96542aa94ff2 100644
--- a/metadata/md5-cache/net-firewall/iptables-1.6.0
+++ b/metadata/md5-cache/net-firewall/iptables-1.6.0-r1
@@ -10,4 +10,4 @@ RDEPEND=conntrack? ( net-libs/libnetfilter_conntrack ) netlink? ( net-libs/libnf
 SLOT=0/11
 SRC_URI=http://www.netfilter.org/projects/iptables/files/iptables-1.6.0.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=8e9c99b4921a6a627640a21ba54e9ba8
+_md5_=36ba66bb4ada49e2139d2c43f9a27ea7
diff --git a/metadata/md5-cache/net-libs/rb_libtorrent-0.16.17-r2 b/metadata/md5-cache/net-libs/rb_libtorrent-0.16.17-r2
deleted file mode 100644
index ed31ea6daafe..000000000000
--- a/metadata/md5-cache/net-libs/rb_libtorrent-0.16.17-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/boost-1.48:=[threads] sys-libs/zlib examples? ( !net-p2p/mldonkey ) ssl? ( dev-libs/openssl:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-libs/boost[python,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) >=sys-devel/libtool-2.2 !<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=C++ BitTorrent implementation focusing on efficiency and scalability
-EAPI=5
-HOMEPAGE=http://libtorrent.org
-IUSE=debug doc examples python ssl static-libs test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=>=dev-libs/boost-1.48:=[threads] sys-libs/zlib examples? ( !net-p2p/mldonkey ) ssl? ( dev-libs/openssl:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-libs/boost[python,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/libtorrent/libtorrent-rasterbar-0.16.17.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8174c6e451cdff3bf459f268bece425c
diff --git a/metadata/md5-cache/net-libs/rb_libtorrent-1.0.8 b/metadata/md5-cache/net-libs/rb_libtorrent-1.0.8
deleted file mode 100644
index c4c419cf299d..000000000000
--- a/metadata/md5-cache/net-libs/rb_libtorrent-1.0.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/boost-1.53:=[threads] sys-libs/zlib examples? ( !net-p2p/mldonkey ) ssl? ( dev-libs/openssl:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:=[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=sys-devel/libtool-2.2 !<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=C++ BitTorrent implementation focusing on efficiency and scalability
-EAPI=5
-HOMEPAGE=http://libtorrent.org
-IUSE=debug doc examples python ssl static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=>=dev-libs/boost-1.53:=[threads] sys-libs/zlib examples? ( !net-p2p/mldonkey ) ssl? ( dev-libs/openssl:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:=[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/arvidn/libtorrent/archive/libtorrent-1_0_8.tar.gz -> rb_libtorrent-1.0.8.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=33ed9446352857639da86d352ef7d3c4
diff --git a/metadata/md5-cache/net-libs/rb_libtorrent-1.0.9 b/metadata/md5-cache/net-libs/rb_libtorrent-1.0.9
deleted file mode 100644
index 3cd0027f465c..000000000000
--- a/metadata/md5-cache/net-libs/rb_libtorrent-1.0.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-libs/boost-1.53:=[threads] sys-libs/zlib examples? ( !net-p2p/mldonkey ) ssl? ( dev-libs/openssl:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:=[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=sys-devel/libtool-2.2 !<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=C++ BitTorrent implementation focusing on efficiency and scalability
-EAPI=6
-HOMEPAGE=http://libtorrent.org
-IUSE=debug doc examples python ssl static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=>=dev-libs/boost-1.53:=[threads] sys-libs/zlib examples? ( !net-p2p/mldonkey ) ssl? ( dev-libs/openssl:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:=[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/arvidn/libtorrent/archive/libtorrent-1_0_9.tar.gz -> rb_libtorrent-1.0.9.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1f18be943a5ea64f84ae57d92ca2a82a
diff --git a/metadata/md5-cache/net-libs/rb_libtorrent-1.0.9-r2 b/metadata/md5-cache/net-libs/rb_libtorrent-1.0.9-r2
new file mode 100644
index 000000000000..786d9eeb4f75
--- /dev/null
+++ b/metadata/md5-cache/net-libs/rb_libtorrent-1.0.9-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-libs/boost:=[threads] virtual/libiconv examples? ( !net-p2p/mldonkey ) geoip? ( dev-libs/geoip ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:=[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) sys-devel/libtool
+DESCRIPTION=C++ BitTorrent implementation focusing on efficiency and scalability
+EAPI=6
+HOMEPAGE=http://libtorrent.org
+IUSE=debug +dht doc examples +geoip libressl python +ssl static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=BSD
+RDEPEND=dev-libs/boost:=[threads] virtual/libiconv examples? ( !net-p2p/mldonkey ) geoip? ( dev-libs/geoip ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_targets_python3_4? ( dev-lang/python:3.4[threads] ) python_targets_python3_5? ( dev-lang/python:3.5[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:=[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) )
+SLOT=0/8
+SRC_URI=https://github.com/arvidn/libtorrent/releases/download/libtorrent-1_0_9/libtorrent-rasterbar-1.0.9.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=e6099ac7fd19de54c8b4c820e10ab7ef
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2016.08.12 b/metadata/md5-cache/net-misc/youtube-dl-2016.08.19
similarity index 96%
rename from metadata/md5-cache/net-misc/youtube-dl-2016.08.12
rename to metadata/md5-cache/net-misc/youtube-dl-2016.08.19
index 8b9e5b69ea44..f22bc58d7c3e 100644
--- a/metadata/md5-cache/net-misc/youtube-dl-2016.08.12
+++ b/metadata/md5-cache/net-misc/youtube-dl-2016.08.19
@@ -9,6 +9,6 @@ LICENSE=public-domain
 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
-SRC_URI=http://youtube-dl.org/downloads/2016.08.12/youtube-dl-2016.08.12.tar.gz
+SRC_URI=http://youtube-dl.org/downloads/2016.08.19/youtube-dl-2016.08.19.tar.gz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=a899d50c46c53f7ab6a72a15f42571f3
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.6.7 b/metadata/md5-cache/net-proxy/haproxy-1.6.8
similarity index 94%
rename from metadata/md5-cache/net-proxy/haproxy-1.6.7
rename to metadata/md5-cache/net-proxy/haproxy-1.6.8
index 6557526b12a8..92858b154b55 100644
--- a/metadata/md5-cache/net-proxy/haproxy-1.6.7
+++ b/metadata/md5-cache/net-proxy/haproxy-1.6.8
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( sys-libs/zlib )
 SLOT=0
-SRC_URI=http://haproxy.1wt.eu/download/1.6/src/haproxy-1.6.7.tar.gz
+SRC_URI=http://haproxy.1wt.eu/download/1.6/src/haproxy-1.6.8.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	d062ae4ba2fc40a19c11de2ad89b6616	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	c66cbe7502fe1161066eb947d15b79f6	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aa72e59b44d63984485361d258e4b433
diff --git a/metadata/md5-cache/sci-physics/hoomd-blue-1.0.2 b/metadata/md5-cache/sci-physics/hoomd-blue-1.0.2
deleted file mode 100644
index 3ae2ccdb67ed..000000000000
--- a/metadata/md5-cache/sci-physics/hoomd-blue-1.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] mpi? ( virtual/mpi ) cuda? ( dev-util/nvidia-cuda-sdk ) zlib? ( sys-libs/zlib ) dev-libs/boost:=[threads,python,mpi,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-2.8.12
-DESCRIPTION=a general-purpose particle simulation toolkit
-EAPI=5
-HOMEPAGE=http://codeblue.umich.edu/hoomd-blue/
-IUSE=cuda doc test mpi +zlib python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4
-KEYWORDS=~amd64
-LICENSE=hoomd-blue
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] mpi? ( virtual/mpi ) cuda? ( dev-util/nvidia-cuda-sdk ) zlib? ( sys-libs/zlib ) dev-libs/boost:=[threads,python,mpi,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 )
-SLOT=0
-SRC_URI=https://bitbucket.org/glotzer/hoomd-blue/get/v1.0.2.tar.bz2 -> hoomd-blue-1.0.2.tar.bz2
-_eclasses_=cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	cuda	0ecb926cd855df14e36328a247443e49	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4a71fe8352fa90da441c3e05d7693152
diff --git a/metadata/md5-cache/sci-physics/hoomd-blue-2.0.1 b/metadata/md5-cache/sci-physics/hoomd-blue-2.0.1
deleted file mode 100644
index 6df5fdc394da..000000000000
--- a/metadata/md5-cache/sci-physics/hoomd-blue-2.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] mpi? ( virtual/mpi ) cuda? ( dev-util/nvidia-cuda-sdk ) dev-libs/boost:=[threads,python,mpi,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] dev-util/ninja >=dev-util/cmake-2.8.12
-DESCRIPTION=a general-purpose particle simulation toolkit
-EAPI=6
-HOMEPAGE=http://codeblue.umich.edu/hoomd-blue/
-IUSE=cuda test mpi python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4
-KEYWORDS=~amd64
-LICENSE=hoomd-blue
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?] mpi? ( virtual/mpi ) cuda? ( dev-util/nvidia-cuda-sdk ) dev-libs/boost:=[threads,python,mpi,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_3(+)?,python_single_target_python3_4(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_3 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python3_4? ( python_targets_python3_4 )
-SLOT=0
-SRC_URI=https://bitbucket.org/glotzer/hoomd-blue/get/v2.0.1.tar.bz2 -> hoomd-blue-2.0.1.tar.bz2 https://bitbucket.org/glotzer/libgetar/get/v0.5.0.tar.bz2 -> libgetar-0.5.0.tar.bz2
-_eclasses_=cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	cuda	0ecb926cd855df14e36328a247443e49	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2647a2482f773007daf858d179461c2a
diff --git a/metadata/md5-cache/sci-physics/hoomd-blue-2.0.2 b/metadata/md5-cache/sci-physics/hoomd-blue-2.0.2
new file mode 100644
index 000000000000..e12e2f99e0cc
--- /dev/null
+++ b/metadata/md5-cache/sci-physics/hoomd-blue-2.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] mpi? ( virtual/mpi ) cuda? ( dev-util/nvidia-cuda-sdk ) dev-libs/boost:=[threads,python,mpi,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-util/ninja >=dev-util/cmake-2.8.12
+DESCRIPTION=a general-purpose particle simulation toolkit
+EAPI=6
+HOMEPAGE=http://codeblue.umich.edu/hoomd-blue/
+IUSE=cuda test mpi python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64
+LICENSE=hoomd-blue
+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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] mpi? ( virtual/mpi ) cuda? ( dev-util/nvidia-cuda-sdk ) dev-libs/boost:=[threads,python,mpi,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://bitbucket.org/glotzer/hoomd-blue/get/v2.0.2.tar.bz2 -> hoomd-blue-2.0.2.tar.bz2 https://bitbucket.org/glotzer/libgetar/get/v0.5.0.tar.bz2 -> libgetar-0.5.0.tar.bz2
+_eclasses_=cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	cuda	0ecb926cd855df14e36328a247443e49	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=c1359828f490fd34603714a6bb517908
diff --git a/metadata/md5-cache/sci-visualization/paraview-5.1.0-r1 b/metadata/md5-cache/sci-visualization/paraview-5.1.0-r1
index ecb43323613a..861608bc109f 100644
--- a/metadata/md5-cache/sci-visualization/paraview-5.1.0-r1
+++ b/metadata/md5-cache/sci-visualization/paraview-5.1.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/expat >=dev-libs/jsoncpp-0.10.1 dev-libs/libxml2:2 dev-libs/protobuf media-libs/freetype media-libs/libpng:0 media-libs/libtheora media-libs/tiff:0= sci-libs/hdf5[mpi=] >=sci-libs/netcdf-4.2[hdf5] >=sci-libs/netcdf-cxx-4.2:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl >=x11-libs/gl2ps-1.3.8 x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt coprocessing? ( plugins? ( dev-python/PyQt5 dev-qt/qtgui:5 ) ) ffmpeg? ( virtual/ffmpeg ) mpi? ( virtual/mpi[cxx,romio] ) mysql? ( virtual/mysql ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/twisted-core dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] mpi? ( dev-python/mpi4py ) qt5? ( dev-python/PyQt5[opengl,webkit,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ) qt5? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 ) sqlite? ( dev-db/sqlite:3 ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-util/cmake-3.3.1 boost? ( >=dev-libs/boost-1.40.0[mpi?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-2.8.12
+DEPEND=dev-libs/expat >=dev-libs/jsoncpp-0.10.1 dev-libs/libxml2:2 dev-libs/protobuf media-libs/freetype media-libs/libpng:0 media-libs/libtheora media-libs/tiff:0= sci-libs/hdf5[mpi=] >=sci-libs/netcdf-4.2[hdf5] >=sci-libs/netcdf-cxx-4.2:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl >=x11-libs/gl2ps-1.3.8 x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt coprocessing? ( plugins? ( dev-python/PyQt5 dev-qt/qtgui:5 ) ) ffmpeg? ( virtual/ffmpeg ) mpi? ( virtual/mpi[cxx,romio] ) mysql? ( virtual/mysql ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/twisted-core dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] mpi? ( dev-python/mpi4py ) qt5? ( dev-python/PyQt5[opengl,webkit,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ) qt5? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 ) sqlite? ( dev-db/sqlite:3 ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-util/cmake-3.3.1 boost? ( >=dev-libs/boost-1.40.0[mpi?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-2.8.12
 DESCRIPTION=ParaView is a powerful scientific data visualization application
 EAPI=5
 HOMEPAGE=http://www.paraview.org
 IUSE=boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol plugins python +qt5 sqlite tcl test tk python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=paraview GPL-2
-RDEPEND=dev-libs/expat >=dev-libs/jsoncpp-0.10.1 dev-libs/libxml2:2 dev-libs/protobuf media-libs/freetype media-libs/libpng:0 media-libs/libtheora media-libs/tiff:0= sci-libs/hdf5[mpi=] >=sci-libs/netcdf-4.2[hdf5] >=sci-libs/netcdf-cxx-4.2:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl >=x11-libs/gl2ps-1.3.8 x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt coprocessing? ( plugins? ( dev-python/PyQt5 dev-qt/qtgui:5 ) ) ffmpeg? ( virtual/ffmpeg ) mpi? ( virtual/mpi[cxx,romio] ) mysql? ( virtual/mysql ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/twisted-core dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] mpi? ( dev-python/mpi4py ) qt5? ( dev-python/PyQt5[opengl,webkit,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ) qt5? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 ) sqlite? ( dev-db/sqlite:3 ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= )
+RDEPEND=dev-libs/expat >=dev-libs/jsoncpp-0.10.1 dev-libs/libxml2:2 dev-libs/protobuf media-libs/freetype media-libs/libpng:0 media-libs/libtheora media-libs/tiff:0= sci-libs/hdf5[mpi=] >=sci-libs/netcdf-4.2[hdf5] >=sci-libs/netcdf-cxx-4.2:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl >=x11-libs/gl2ps-1.3.8 x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt coprocessing? ( plugins? ( dev-python/PyQt5 dev-qt/qtgui:5 ) ) ffmpeg? ( virtual/ffmpeg ) mpi? ( virtual/mpi[cxx,romio] ) mysql? ( virtual/mysql ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/twisted-core dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] mpi? ( dev-python/mpi4py ) qt5? ( dev-python/PyQt5[opengl,webkit,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ) qt5? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 ) sqlite? ( dev-db/sqlite:3 ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= )
 REQUIRED_USE=python? ( mpi python_targets_python2_7 ) mysql? ( sqlite )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.paraview.org/files/v5.1/ParaView-v5.1.0.tar.gz
 _eclasses_=cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=45ceec7d2cc169ab0b3d82c3c055437a
+_md5_=a80f93368a11586e3bd2a3bb2214118d
diff --git a/metadata/md5-cache/sci-visualization/paraview-5.1.2 b/metadata/md5-cache/sci-visualization/paraview-5.1.2
new file mode 100644
index 000000000000..68d112763ba1
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/paraview-5.1.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=dev-libs/expat >=dev-libs/jsoncpp-0.10.1 dev-libs/libxml2:2 dev-libs/protobuf media-libs/freetype media-libs/libpng:0 media-libs/libtheora media-libs/tiff:0= sci-libs/hdf5[mpi=] >=sci-libs/netcdf-4.2[hdf5] >=sci-libs/netcdf-cxx-4.2:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt coprocessing? ( plugins? ( dev-python/PyQt5 dev-qt/qtgui:5 ) ) ffmpeg? ( virtual/ffmpeg ) mpi? ( virtual/mpi[cxx,romio] ) mysql? ( virtual/mysql ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/twisted-core dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] mpi? ( dev-python/mpi4py ) qt5? ( dev-python/PyQt5[opengl,webkit,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ) qt5? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 ) sqlite? ( dev-db/sqlite:3 ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-util/cmake-3.3.1 boost? ( >=dev-libs/boost-1.40.0[mpi?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=ParaView is a powerful scientific data visualization application
+EAPI=5
+HOMEPAGE=http://www.paraview.org
+IUSE=boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp plugins python +qt5 sqlite tcl test tk python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=paraview GPL-2
+RDEPEND=dev-libs/expat >=dev-libs/jsoncpp-0.10.1 dev-libs/libxml2:2 dev-libs/protobuf media-libs/freetype media-libs/libpng:0 media-libs/libtheora media-libs/tiff:0= sci-libs/hdf5[mpi=] >=sci-libs/netcdf-4.2[hdf5] >=sci-libs/netcdf-cxx-4.2:3 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXt coprocessing? ( plugins? ( dev-python/PyQt5 dev-qt/qtgui:5 ) ) ffmpeg? ( virtual/ffmpeg ) mpi? ( virtual/mpi[cxx,romio] ) mysql? ( virtual/mysql ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/twisted-core dev-python/zope-interface[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] mpi? ( dev-python/mpi4py ) qt5? ( dev-python/PyQt5[opengl,webkit,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) ) qt5? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtopengl:5 dev-qt/qtsql:5 dev-qt/qttest:5 dev-qt/qtwebkit:5 dev-qt/qtx11extras:5 ) sqlite? ( dev-db/sqlite:3 ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= )
+REQUIRED_USE=python? ( mpi python_targets_python2_7 ) mysql? ( sqlite )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.paraview.org/files/v5.1/ParaView-v5.1.2.tar.gz
+_eclasses_=cmake-utils	022d8ca5c8887ca2d21e83b57f5c75ff	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=d2651648e2ea0176b07c819a94d05c50
diff --git a/metadata/md5-cache/sys-apps/moreutils-0.60 b/metadata/md5-cache/sys-apps/moreutils-0.60
new file mode 100644
index 000000000000..919439c64b46
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/moreutils-0.60
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=doc? ( dev-lang/perl >=app-text/docbook2X-0.8.8-r2 app-text/docbook-xml-dtd:4.4 )
+DESCRIPTION=a collection of tools that nobody thought to write when Unix was young
+EAPI=6
+HOMEPAGE=http://joeyh.name/code/moreutils/
+IUSE=+doc +perl
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux
+LICENSE=GPL-2
+RDEPEND=perl? ( dev-lang/perl dev-perl/IPC-Run dev-perl/Time-Duration dev-perl/TimeDate )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~radhermit/dist/moreutils-0.60.tar.gz
+_eclasses_=multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=e89396a01ddb4e266101c0027eeb3d5b
diff --git a/metadata/md5-cache/www-client/chromium-53.0.2785.21 b/metadata/md5-cache/www-client/chromium-53.0.2785.70
similarity index 98%
rename from metadata/md5-cache/www-client/chromium-53.0.2785.21
rename to metadata/md5-cache/www-client/chromium-53.0.2785.70
index 4c3212ba679f..733ade296ee6 100644
--- a/metadata/md5-cache/www-client/chromium-53.0.2785.21
+++ b/metadata/md5-cache/www-client/chromium-53.0.2785.70
@@ -10,6 +10,6 @@ RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils
 REQUIRED_USE=gn? ( gnome gnome-keyring !tcmalloc )
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-53.0.2785.21.tar.xz
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-53.0.2785.70.tar.xz
 _eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	chromium-2	f07d06dea52f33b6052aca07bac42af3	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	pax-utils	ecf634cba91bb9591a8fdb6f6145f1bb	portability	bb1a0ed8ea152b957d17339f01d4d7f5	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fbd79f785ebbb6d206305f0e8d30cd39
+_md5_=065f2d0fbf4c206d504fa045b81c661f
diff --git a/metadata/md5-cache/www-client/opera-beta-40.0.2308.15 b/metadata/md5-cache/www-client/opera-beta-40.0.2308.15
new file mode 100644
index 000000000000..6b2ff127e372
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-beta-40.0.2308.15
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare setup unpack
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=http://www.opera.com/
+IUSE=+l10n_af +l10n_az +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_es-419 +l10n_es +l10n_fil +l10n_fi +l10n_fr-CA +l10n_fr +l10n_fy +l10n_gd +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kk +l10n_ko +l10n_lt +l10n_lv +l10n_me +l10n_mk +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pa +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_uz +l10n_vi +l10n_zh-CN +l10n_zh-TW +l10n_zu
+KEYWORDS=~amd64 ~x86
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera-beta/40.0.2308.15/linux/opera-beta_40.0.2308.15_amd64.deb ) x86? ( http://get.geo.opera.com/pub/opera-beta/40.0.2308.15/linux/opera-beta_40.0.2308.15_i386.deb )
+_eclasses_=chromium-2	f07d06dea52f33b6052aca07bac42af3	eutils	792f83d5ec9536cb5ccef375469d8bde	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=713265bdfd0b73d96a95da2a2d80fd47
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index e3ca09c6c58a..ffed7c03bc76 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 18 Aug 2016 20:40:37 +0000
+Fri, 19 Aug 2016 05:40:41 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index a29a8598941f..a431f64c767e 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Aug 18 20:39:42 UTC 2016
+Fri Aug 19 05:39:46 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 3c7f04eb2f2f..d5c14869b5cf 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 18 Aug 2016 21:30:01 +0000
+Fri, 19 Aug 2016 06:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 365708fbaa4d..ee25b5196fa7 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1471552802 Thu 18 Aug 2016 08:40:02 PM UTC
+1471585201 Fri 19 Aug 2016 05:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index e3ca09c6c58a..ffed7c03bc76 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 18 Aug 2016 20:40:37 +0000
+Fri, 19 Aug 2016 05:40:41 +0000
diff --git a/net-firewall/iptables/iptables-1.6.0.ebuild b/net-firewall/iptables/iptables-1.6.0-r1.ebuild
similarity index 94%
rename from net-firewall/iptables/iptables-1.6.0.ebuild
rename to net-firewall/iptables/iptables-1.6.0-r1.ebuild
index d3c06aaa1420..a8fe28244ad1 100644
--- a/net-firewall/iptables/iptables-1.6.0.ebuild
+++ b/net-firewall/iptables/iptables-1.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -101,9 +101,9 @@ src_install() {
 		newconfd "${FILESDIR}"/ip6tables-1.4.13.confd ip6tables
 	fi
 
-	systemd_dounit "${FILESDIR}"/systemd/iptables{,-{re,}store}.service
+	systemd_dounit "${FILESDIR}"/systemd/iptables-{re,}store.service
 	if use ipv6 ; then
-		systemd_dounit "${FILESDIR}"/systemd/ip6tables{,-{re,}store}.service
+		systemd_dounit "${FILESDIR}"/systemd/ip6tables-{re,}store.service
 	fi
 
 	# Move important libs to /lib #332175
diff --git a/net-libs/rb_libtorrent/Manifest b/net-libs/rb_libtorrent/Manifest
index eece58d1a6e8..dcccf6518639 100644
--- a/net-libs/rb_libtorrent/Manifest
+++ b/net-libs/rb_libtorrent/Manifest
@@ -1,5 +1,5 @@
 DIST libtorrent-rasterbar-0.16.17.tar.gz 3018881 SHA256 67a1d29c626d991d6e39c2f9828ca70c4053d057070ce01fff9b4ad37e64aff0 SHA512 532b2438e24c3ecad239480a1bd6241a0d73d40f8d5bdcf61ddfcee1a41f1644c9004d4f234968efd50158224219b78852ec936a05b75b15f3442b594460cdd6 WHIRLPOOL 755e201741ed77cf91cb0976cbaa83c645647341d2cfe40564552599f2792ba76bd02e82a94669d80b199f1a1d6290824686d2bb52d6b0da8663d2274176f3eb
 DIST libtorrent-rasterbar-0.16.19.tar.gz 3030253 SHA256 9ebd3fa8accfa27d0c81cdbbe15d7b411ea1deec34ac6325dec7197f05d82982 SHA512 8e605802cb1ae80228d253adba44da6f5af39e7d65c59f65e15444ed1122500529ee068f6d3608b1c2a249f18b4de695073f7b67772fa445618757697d779340 WHIRLPOOL 4429d07bd95f398a09f283a7cbcf6611aeb8ac5d2b8ed76d98f89d601aa6ed66e6eb8f044b351fad6cca3606351ccc67081dba7c8dd8d9c3c433eae84aedeb2c
 DIST libtorrent-rasterbar-1.0.7.tar.gz 3298005 SHA256 3e16e024b175fefada17471c659fdbcfab235f9619d4f0913faa13cb02ca8d83 SHA512 d60736af4b7c38317821810995dd9bec21688a9506e9b908394c2a1a87acd2abf23000856dedcad487b9ecc7b5680f83cfc09ff9db79af00fe21e94337daeacf WHIRLPOOL aff289e3ca85eedf688e8a898f0164a4d692e8c813b04dbae6323bc56003f5c3af862167a1d00a8bfe193dfda15d20a18a48bcbeac9313e29d6f2de35d20e621
-DIST rb_libtorrent-1.0.8.tar.gz 2977324 SHA256 24498625d946b80b2269789fb666196240fe805a0b6417d83d1f4dd9ee5f9a7a SHA512 7ab98712225e19224c969fe4c6cd2f21f0aff3f5130dc1b3a0ea1b339b23b3cd303e76aeec9ac23e253c77865c60fd6623f7c8cd4e336c5a16fdf3d4627b88e2 WHIRLPOOL 23c3f84f304e642c7c25239a8a209d37afde41454f8688ef1b24c680d0d268e9163244dc06b973a49a8173f7e1cd7b7bf4f359fb89294cee5868060a64dbb2eb
+DIST libtorrent-rasterbar-1.0.9.tar.gz 3292886 SHA256 11a93125ed49f796fca83da925ab7dc29e91d88b915f078caaddaaf559d63db6 SHA512 68558d440c8220711a410e54a28316b7b98f6dd4d0dae2d56cee3a3f0bd031f8b0623a8eb3fde312c4d1b61b4be8fc21396cb3e9fd7f6d86e3a9a693ee036b66 WHIRLPOOL 2c2f695458fe1069d4159d308def7591bc318eed30e649bc5ad4579fef1c67d3ccabc6acfb7570ae09a9b78fe8c00f975c88d48231b9db71e714672e1043d1f5
 DIST rb_libtorrent-1.0.9.tar.gz 2977503 SHA256 f4eadcbc779edc590d0162b0188c1b179d2cc72519c3756989ef925e376ddecd SHA512 0980ebb5567310ad6f235899770cfc7a23ef754f5a8513e1baa8bbec139ff26006a6b47a1cca62e45da496b901c6646eee3dd76ab4bb5410ce3fc119e717c072 WHIRLPOOL 7c6862d9d4fbc27d6de04cba8ac605dbffafcf1b26a3519bc94964727416655450b74cb62928f27fa568dcc163c8a599ca78f080a86171b6e1283d9b794924b8
diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.9-CVE-2016-5301.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.9-CVE-2016-5301.patch
new file mode 100644
index 000000000000..19ebeeb2fd98
--- /dev/null
+++ b/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.9-CVE-2016-5301.patch
@@ -0,0 +1,289 @@
+From 22099cec46741417a6fb6df560468eb64655db33 Mon Sep 17 00:00:00 2001
+From: arvidn <arvid@cs.umu.se>
+Date: Sat, 4 Jun 2016 12:49:38 -0400
+Subject: [PATCH] back-port http_parser bugfix
+
+---
+ src/http_parser.cpp                       |  32 +++++++
+ test/test_http_parser.cpp                 | 142 ++++++++++++++++++++++++------
+
+diff --git a/src/http_parser.cpp b/src/http_parser.cpp
+index 7664cad..89de739 100644
+--- a/src/http_parser.cpp
++++ b/src/http_parser.cpp
+@@ -151,6 +151,7 @@ namespace libtorrent
+ 		if (m_state == read_status)
+ 		{
+ 			TORRENT_ASSERT(!m_finished);
++			TORRENT_ASSERT(pos <= recv_buffer.end);
+ 			char const* newline = std::find(pos, recv_buffer.end, '\n');
+ 			// if we don't have a full line yet, wait.
+ 			if (newline == recv_buffer.end)
+@@ -171,6 +172,7 @@ namespace libtorrent
+ 
+ 			char const* line = pos;
+ 			++newline;
++			TORRENT_ASSERT(newline >= pos);
+ 			int incoming = int(newline - pos);
+ 			m_recv_pos += incoming;
+ 			boost::get<1>(ret) += newline - (m_recv_buffer.begin + start_pos);
+@@ -204,6 +206,7 @@ namespace libtorrent
+ 		if (m_state == read_header)
+ 		{
+ 			TORRENT_ASSERT(!m_finished);
++			TORRENT_ASSERT(pos <= recv_buffer.end);
+ 			char const* newline = std::find(pos, recv_buffer.end, '\n');
+ 			std::string line;
+ 
+@@ -254,6 +257,12 @@ namespace libtorrent
+ 				if (name == "content-length")
+ 				{
+ 					m_content_length = strtoll(value.c_str(), 0, 10);
++					if (m_content_length < 0)
++					{
++						m_state = error_state;
++						error = true;
++						return ret;
++					}
+ 				}
+ 				else if (name == "connection")
+ 				{
+@@ -271,12 +280,24 @@ namespace libtorrent
+ 					if (string_begins_no_case("bytes ", ptr)) ptr += 6;
+ 					char* end;
+ 					m_range_start = strtoll(ptr, &end, 10);
++					if (m_range_start < 0)
++					{
++						m_state = error_state;
++						error = true;
++						return ret;
++					}
+ 					if (end == ptr) success = false;
+ 					else if (*end != '-') success = false;
+ 					else
+ 					{
+ 						ptr = end + 1;
+ 						m_range_end = strtoll(ptr, &end, 10);
++						if (m_range_end < 0)
++						{
++							m_state = error_state;
++							error = true;
++							return ret;
++						}
+ 						if (end == ptr) success = false;
+ 					}
+ 
+@@ -295,6 +316,7 @@ namespace libtorrent
+ 				}
+ 
+ 				TORRENT_ASSERT(m_recv_pos <= recv_buffer.left());
++				TORRENT_ASSERT(pos <= recv_buffer.end);
+ 				newline = std::find(pos, recv_buffer.end, '\n');
+ 			}
+ 			boost::get<1>(ret) += newline - (m_recv_buffer.begin + start_pos);
+@@ -324,6 +346,12 @@ namespace libtorrent
+ 					int header_size;
+ 					if (parse_chunk_header(buf, &chunk_size, &header_size))
+ 					{
++						if (chunk_size < 0)
++						{
++							m_state = error_state;
++							error = true;
++							return ret;
++						}
+ 						if (chunk_size > 0)
+ 						{
+ 							std::pair<size_type, size_type> chunk_range(m_cur_chunk_end + header_size
+@@ -396,6 +424,7 @@ namespace libtorrent
+ 	bool http_parser::parse_chunk_header(buffer::const_interval buf
+ 		, size_type* chunk_size, int* header_size)
+ 	{
++		TORRENT_ASSERT(buf.begin <= buf.end);
+ 		char const* pos = buf.begin;
+ 
+ 		// ignore one optional new-line. This is since each chunk
+@@ -406,6 +435,7 @@ namespace libtorrent
+ 		if (pos < buf.end && pos[0] == '\n') ++pos;
+ 		if (pos == buf.end) return false;
+ 
++		TORRENT_ASSERT(pos <= buf.end);
+ 		char const* newline = std::find(pos, buf.end, '\n');
+ 		if (newline == buf.end) return false;
+ 		++newline;
+@@ -418,6 +448,8 @@ namespace libtorrent
+ 
+ 		// first, read the chunk length
+ 		*chunk_size = strtoll(pos, 0, 16);
++		if (*chunk_size < 0) return true;
++
+ 		if (*chunk_size != 0)
+ 		{
+ 			*header_size = newline - buf.begin;
+diff --git a/test/test_http_parser.cpp b/test/test_http_parser.cpp
+index 1385e94..0bbb038 100644
+--- a/test/test_http_parser.cpp
++++ b/test/test_http_parser.cpp
+@@ -64,10 +64,13 @@ tuple<int, int, bool> feed_bytes(http_parser& parser, char const* str)
+ 			ret.get<1>() += protocol;
+ 			ret.get<2>() |= error;
+ //			std::cerr << payload << ", " << protocol << ", " << chunk_size << std::endl;
+-			TORRENT_ASSERT(payload + protocol == chunk_size);
++			TORRENT_ASSERT(payload + protocol == chunk_size || error);
++		}
++		if (!ret.get<2>())
++		{
++			TEST_CHECK(prev == make_tuple(0, 0, false) || ret == prev);
++			TEST_EQUAL(ret.get<0>() + ret.get<1>(), strlen(str));
+ 		}
+-		TEST_CHECK(prev == make_tuple(0, 0, false) || ret == prev);
+-		TEST_EQUAL(ret.get<0>() + ret.get<1>(), strlen(str));
+ 		prev = ret;
+ 	}
+ 	return ret;
+@@ -316,29 +319,6 @@ int test_main()
+ 		TEST_EQUAL(parser.headers().find("test2")->second, "bar");
+ 	}
+ 
+-	// test chunked encoding
+-
+-	parser.reset();
+-
+-	char const* chunked_input =
+-		"HTTP/1.1 200 OK\r\n"
+-		"Transfer-Encoding: chunked\r\n"
+-		"Content-Type: text/plain\r\n"
+-		"\r\n"
+-		"4\r\ntest\r\n4\r\n1234\r\n10\r\n0123456789abcdef\r\n"
+-		"0\r\n\r\n";
+-	received = feed_bytes(parser, chunked_input);
+-
+-	TEST_EQUAL(strlen(chunked_input), 24 + 94)
+-	TEST_CHECK(received == make_tuple(24, 94, false));
+-	TEST_CHECK(parser.finished());
+-
+-	char mutable_buffer[100];
+-	memcpy(mutable_buffer, parser.get_body().begin, parser.get_body().left());
+-	int len = parser.collapse_chunk_headers(mutable_buffer, parser.get_body().left());
+-
+-	TEST_CHECK(std::equal(mutable_buffer, mutable_buffer + len, "test12340123456789abcdef"));
+-
+ 	// test url parsing
+ 
+ 	error_code ec;
+@@ -392,6 +372,116 @@ int test_main()
+ 	TEST_EQUAL(resolve_redirect_location("http://example.com/a/b", "http://test.com/d")
+ 		, "http://test.com/d");
+ 
++	char const* chunked_input =
++		"HTTP/1.1 200 OK\r\n"
++		"Transfer-Encoding: chunked\r\n"
++		"Content-Type: text/plain\r\n"
++		"\r\n"
++		"4\r\ntest\r\n4\r\n1234\r\n10\r\n0123456789abcdef\r\n"
++		"0\r\n\r\n";
++
++{
++	http_parser parser;
++	boost::tuple<int, int, bool> const received
++		= feed_bytes(parser, chunked_input);
++
++	TEST_EQUAL(strlen(chunked_input), 24 + 94)
++	TEST_CHECK(received == make_tuple(24, 94, false));
++	TEST_CHECK(parser.finished());
++
++	char mutable_buffer[100];
++	memcpy(mutable_buffer, parser.get_body().begin, parser.get_body().left());
++	int len = parser.collapse_chunk_headers(mutable_buffer, parser.get_body().left());
++
++	TEST_CHECK(std::equal(mutable_buffer, mutable_buffer + len, "test12340123456789abcdef"));
++}
++
++{
++	char const* chunked_input =
++		"HTTP/1.1 200 OK\r\n"
++		"Transfer-Encoding: chunked\r\n"
++		"Content-Length: -45345\r\n"
++		"\r\n";
++
++	http_parser parser;
++	boost::tuple<int, int, bool> const received
++		= feed_bytes(parser, chunked_input);
++
++	TEST_CHECK(boost::get<2>(received) == true);
++}
++
++{
++	char const* chunked_input =
++		"HTTP/1.1 200 OK\r\n"
++		"Transfer-Encoding: chunked\r\n"
++		"\r\n"
++		"-53465234545\r\n"
++		"foobar";
++
++	http_parser parser;
++	boost::tuple<int, int, bool> const received
++		= feed_bytes(parser, chunked_input);
++
++	TEST_CHECK(boost::get<2>(received) == true);
++}
++
++{
++	char const* chunked_input =
++		"HTTP/1.1 206 OK\n"
++		"Content-Range: bYTes -3-4\n"
++		"\n";
++
++	http_parser parser;
++	boost::tuple<int, int, bool> const received
++		= feed_bytes(parser, chunked_input);
++
++	TEST_CHECK(boost::get<2>(received) == true);
++}
++
++{
++	char const* chunked_input =
++		"HTTP/1.1 206 OK\n"
++		"Content-Range: bYTes 3--434\n"
++		"\n";
++
++	http_parser parser;
++	boost::tuple<int, int, bool> const received
++		= feed_bytes(parser, chunked_input);
++
++	TEST_CHECK(boost::get<2>(received) == true);
++}
++
++{
++	boost::uint8_t const invalid_chunked_input[] = {
++		0x48, 0x6f, 0x54, 0x50, 0x2f, 0x31, 0x2e, 0x31, // HoTP/1.1 200 OK
++		0x20, 0x32, 0x30, 0x30, 0x20, 0x4f, 0x4b, 0x0d, // Cont-Length: 20
++		0x0a, 0x43, 0x6f, 0x6e, 0x74, 0x2d, 0x4c, 0x65, // Contente: tn
++		0x6e, 0x67, 0x74, 0x68, 0x3a, 0x20, 0x32, 0x30, // Transfer-Encoding: chunked
++		0x0d, 0x0a, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, //
++		0x74, 0x65, 0x3a, 0x20, 0x74, 0x6e, 0x0d, 0x0a, //
++		0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, //
++		0x2d, 0x45, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, // -89abc9abcdef
++		0x67, 0x3a, 0x20, 0x63, 0x68, 0x75, 0x6e, 0x6b, // �
++		0x65, 0x64, 0x0d, 0x0a, 0x0d, 0x0d, 0x0a, 0x0d, // T����������def
++		0x0a, 0x0a, 0x2d, 0x38, 0x39, 0x61, 0x62, 0x63, // �
++		0x39, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x0d, // T�����������est-headyr: foobar
++		0x0a, 0xd6, 0x0d, 0x0a, 0x54, 0xbd, 0xbd, 0xbd,
++		0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x64,
++		0x65, 0x66, 0x0d, 0x0a, 0xd6, 0x0d, 0x0a, 0x54,
++		0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd,
++		0xbd, 0xbd, 0xbd, 0x65, 0x73, 0x74, 0x2d, 0x68,
++		0x65, 0x61, 0x64, 0x79, 0x72, 0x3a, 0x20, 0x66,
++		0x6f, 0x6f, 0x62, 0x61, 0x72, 0x0d, 0x0a, 0x0d,
++		0x0a, 0x00
++	};
++
++	http_parser parser;
++	boost::tuple<int, int, bool> const received
++		= feed_bytes(parser, reinterpret_cast<char const*>(invalid_chunked_input));
++
++	TEST_CHECK(boost::get<2>(received) == true);
++}
++
+ 	return 0;
+ }
+ 
diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.9-test_torrent_parse.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.9-test_torrent_parse.patch
new file mode 100644
index 000000000000..658c0aa57156
--- /dev/null
+++ b/net-libs/rb_libtorrent/files/rb_libtorrent-1.0.9-test_torrent_parse.patch
@@ -0,0 +1,41 @@
+From bdd91e29225b44a1a13e670dc4cecfb58f241d28 Mon Sep 17 00:00:00 2001
+From: Davide Pesavento <pesa@gentoo.org>
+Date: Sun, 7 Aug 2016 12:14:57 +0200
+Subject: [PATCH] Disable failing torrent_parse tests
+
+For unknown reasons, some test torrents are missing from the tarball.
+Skip the corresponding test cases to avoid spurious failures.
+---
+ test/test_torrent_parse.cpp | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/test/test_torrent_parse.cpp b/test/test_torrent_parse.cpp
+index 663f341..2de6fb5 100644
+--- a/test/test_torrent_parse.cpp
++++ b/test/test_torrent_parse.cpp
+@@ -49,13 +49,10 @@ using namespace libtorrent;
+ test_torrent_t test_torrents[] =
+ {
+ 	{ "base.torrent" },
+-	{ "empty_path.torrent" },
+ 	{ "parent_path.torrent" },
+ 	{ "hidden_parent_path.torrent" },
+ 	{ "single_multi_file.torrent" },
+ 	{ "slash_path.torrent" },
+-	{ "slash_path2.torrent" },
+-	{ "slash_path3.torrent" },
+ 	{ "backslash_path.torrent" },
+ 	{ "url_list.torrent" },
+ 	{ "url_list2.torrent" },
+@@ -75,8 +72,6 @@ test_torrent_t test_torrents[] =
+ 	{ "root_hash.torrent" },
+ 	{ "empty_path_multi.torrent" },
+ 	{ "duplicate_web_seeds.torrent" },
+-	{ "invalid_name3.torrent" },
+-	{ "symlink1.torrent" },
+ };
+ 
+ struct test_failing_torrent_t
+-- 
+2.9.2
+
diff --git a/net-libs/rb_libtorrent/metadata.xml b/net-libs/rb_libtorrent/metadata.xml
index 36ca5cca72a4..4133516fb4f6 100644
--- a/net-libs/rb_libtorrent/metadata.xml
+++ b/net-libs/rb_libtorrent/metadata.xml
@@ -11,7 +11,6 @@
     <remote-id type="github">arvidn/libtorrent</remote-id>
   </upstream>
   <use>
-    <flag name="dht">Enable DHT (distributed hash table) support for
-      libtorrent</flag>
+    <flag name="dht">Enable DHT (distributed hash table) support</flag>
   </use>
 </pkgmetadata>
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.16.17-r2.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.16.17-r2.ebuild
deleted file mode 100644
index f11971e40ac4..000000000000
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.16.17-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-PYTHON_REQ_USE="threads"
-DISTUTILS_OPTIONAL=true
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils multilib distutils-r1
-
-MY_P=${P/rb_/}
-MY_P=${MY_P/torrent/torrent-rasterbar}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="http://libtorrent.org"
-SRC_URI="mirror://sourceforge/libtorrent/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc examples python ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/boost-1.48:=[threads]
-	sys-libs/zlib
-	examples? ( !net-p2p/mldonkey )
-	ssl? ( dev-libs/openssl:0= )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost[python,${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${P}-python.patch )
-
-src_configure() {
-	local myeconfargs=(
-		--disable-silent-rules # bug 441842
-		--with-boost-libdir=/usr/$(get_libdir)
-		$(use_enable debug)
-		$(use_enable test tests)
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable python python-binding)
-		$(usex debug "--enable-logging=verbose" "")
-	)
-
-	use python && python_setup
-
-	autotools-utils_src_configure
-	use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS=( docs/. )
-
-	autotools-utils_src_install
-	use python && cd "${BUILD_DIR}"/bindings/python && distutils-r1_src_install
-}
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-1.0.8.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-1.0.8.ebuild
deleted file mode 100644
index 40a8610bd8de..000000000000
--- a/net-libs/rb_libtorrent/rb_libtorrent-1.0.8.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="threads"
-DISTUTILS_OPTIONAL=true
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils multilib distutils-r1 versionator
-
-MY_PV=$(replace_all_version_separators '_' )
-S=${WORKDIR}/libtorrent-libtorrent-${MY_PV}
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="http://libtorrent.org"
-SRC_URI="https://github.com/arvidn/libtorrent/archive/libtorrent-${MY_PV}.tar.gz -> rb_libtorrent-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc examples python ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/boost-1.53:=[threads]
-	sys-libs/zlib
-	examples? ( !net-p2p/mldonkey )
-	ssl? ( dev-libs/openssl:0= )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2"
-
-RESTRICT="test"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	chmod a-x docs/*.rst docs/*.htm* src/*.cpp include/libtorrent/*.hpp || die
-	./autotool.sh
-}
-
-src_configure() {
-	if use python_targets_python3_4 ;then
-		boost_py3="--with-boost-python=3.4"
-	elif use python_targets_python3_5 ;then
-		boost_py3="--with-boost-python=3.5"
-	else
-		boost_py3=""
-	fi
-
-	if use python_targets_python2_7 ;then
-		boost_py2="--with-boost-python=2.7"
-	else
-		boost_py2=""
-	fi
-
-	local myeconfargs=(
-		--disable-silent-rules # bug 441842
-		--with-boost-system=mt
-		$(use_enable debug)
-		$(use_enable test tests)
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable python python-binding)
-		$(usex debug "--enable-logging=verbose" "")
-		${boost_py3}
-		${boost_py2}
-	)
-
-	if use python ;then
-		python_setup
-	fi
-
-	autotools-utils_src_configure
-
-	if use python ;then
-		cd "${BUILD_DIR}"/bindings/python || die && \
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	if use python ;then
-		cd "${BUILD_DIR}"/bindings/python || die && \
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	if use doc ;then
-		HTML_DOCS=( "${S}"/docs/. )
-	fi
-
-	autotools-utils_src_install
-
-	if use python ;then
-		cd "${BUILD_DIR}"/bindings/python || die && \
-		distutils-r1_src_install
-	fi
-}
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-1.0.9-r2.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-1.0.9-r2.ebuild
new file mode 100644
index 000000000000..0fc1b7bb7049
--- /dev/null
+++ b/net-libs/rb_libtorrent/rb_libtorrent-1.0.9-r2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE="threads"
+DISTUTILS_OPTIONAL=true
+DISTUTILS_IN_SOURCE_BUILD=true
+
+inherit distutils-r1 eutils versionator
+
+MY_P=libtorrent-rasterbar-${PV} # TODO: rename, bug 576126
+MY_PV=$(replace_all_version_separators _)
+
+DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
+HOMEPAGE="http://libtorrent.org"
+SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/8"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug +dht doc examples +geoip libressl python +ssl static-libs test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	virtual/libiconv
+	examples? ( !net-p2p/mldonkey )
+	geoip? ( dev-libs/geoip )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.9-CVE-2016-5301.patch"
+	"${FILESDIR}/${PN}-1.0.9-test_torrent_parse.patch"
+)
+
+src_prepare() {
+	default
+
+	# bug 578026
+	# prepend -L${S}/... to ensure bindings link against the lib we just built
+	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/compile_flags.in || die
+
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable debug logging)
+		$(use_enable debug statistics)
+		$(use_enable debug disk-stats)
+		$(use_enable dht dht $(usex debug logging yes))
+		$(use_enable examples)
+		$(use_enable geoip)
+		$(use_with   geoip libgeoip)
+		$(use_enable ssl encryption)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+		--with-libiconv
+	)
+	econf "${myeconfargs[@]}"
+
+	if use python; then
+		myeconfargs+=(
+			--enable-python-binding
+			--with-boost-python
+		)
+		python_configure() {
+			econf "${myeconfargs[@]}"
+		}
+		distutils-r1_src_configure
+	fi
+}
+
+src_compile() {
+	default
+
+	python_compile() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_compile
+	}
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	use doc && HTML_DOCS+=( "${S}"/docs )
+
+	default
+
+	python_install() {
+		cd "${BUILD_DIR}/../bindings/python" || die
+		distutils-r1_python_install
+	}
+	use python && distutils-r1_src_install
+
+	prune_libtool_files
+}
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-1.0.9.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-1.0.9.ebuild
deleted file mode 100644
index 1bf582f18635..000000000000
--- a/net-libs/rb_libtorrent/rb_libtorrent-1.0.9.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="threads"
-DISTUTILS_OPTIONAL=true
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools multilib distutils-r1 versionator
-
-MY_PV=$(replace_all_version_separators '_' )
-S=${WORKDIR}/libtorrent-libtorrent-${MY_PV}
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="http://libtorrent.org"
-SRC_URI="https://github.com/arvidn/libtorrent/archive/libtorrent-${MY_PV}.tar.gz -> rb_libtorrent-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc examples python ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/boost-1.53:=[threads]
-	sys-libs/zlib
-	examples? ( !net-p2p/mldonkey )
-	ssl? ( dev-libs/openssl:0= )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	chmod a-x docs/*.rst docs/*.htm* src/*.cpp include/libtorrent/*.hpp || die
-
-	# needed or else eautoreconf fails
-	mkdir build-aux || die
-	cp {m4,build-aux}/config.rpath || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local boost_py2 boost_py3
-
-	if use python_targets_python3_5 ;then
-		boost_py3="--with-boost-python=3.5"
-	elif use python_targets_python3_4 ;then
-		boost_py3="--with-boost-python=3.4"
-	fi
-
-	if use python_targets_python2_7 ;then
-		boost_py2="--with-boost-python=2.7"
-	fi
-
-	local myeconfargs=(
-		--enable-shared
-		--disable-silent-rules # bug 441842
-		--with-boost-system=mt
-		$(use_enable debug)
-		$(use_enable test tests)
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable python python-binding)
-		$(usex debug "--enable-logging=verbose" "")
-		${boost_py3}
-		${boost_py2}
-	)
-
-	if use python ;then
-		python_setup
-	fi
-
-	econf ${myeconfargs[@]}
-
-	if use python ;then
-		cd "${S}"/bindings/python || die
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	if use python ;then
-		cd "${S}"/bindings/python || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default
-
-	if use python ;then
-		cd "${S}"/bindings/python || die
-		distutils-r1_src_install
-	fi
-
-	if use doc ;then
-		docinto html
-		pushd "${S}"/docs &>/dev/null || die
-		dodoc -r img
-		dodoc *.{css,gif,html,jpg,png}
-	fi
-}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 5eea2b3596c0..be7df611e4a9 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1,3 @@
 DIST youtube-dl-2016.01.01.tar.gz 1874602 SHA256 732f37c99d71b4239d72d61dd32214b5a5a618671fb0629c8f8deb28209a172c SHA512 fdb022bed426250e5ee1c2bcc1354dd195c0f9793ca479ca8ca4cfe2f71e07ba100b0dbcda2fb9f310308ab130587d06b16a6a86f9036f0d196b317d2e5b5e92 WHIRLPOOL 152e709ba15264c35a89644ea0d4793bb47c82b317e54043ccfff72e40bdf95e42d76605e801233632d3863537a945cfb9ecc2f75245171b8de31b51ce6af801
-DIST youtube-dl-2016.08.12.tar.gz 2318468 SHA256 fb5224b78cee45df9514d96441c4ec9d9934215e504c07fe8c9252285a33ea5e SHA512 2bc1a32fd92df327588f4fdb2a8cadbb1d56349b28b037b85855cb8fcc0eb2277aaad8b8a62c2fb54d5d48bf0dfcb6287d8a31b94b6945e898133f4d05914a08 WHIRLPOOL 914b372624780bc84865e88aca5f8f0f49c5a024ae5828fc97be4a8aa0962dd5340c569cf4ce6bdf6b2d54d3c57cf676bbc71901079fe1321218fa9b9814ed21
 DIST youtube-dl-2016.08.13.tar.gz 2317746 SHA256 b68b00744f5578c3225d1231d4001a39c79b5912a68de2da1c39c648e36dfeba SHA512 5ab1ddfd31c469a9783125b860cc0cfcd9b0e97beabbf5b00cbb6c92e6f29f02ccc0bc6a6c0b2e8be781e1fb8ca379269bc6dfd8fd478815d18dacecd8ee245f WHIRLPOOL d0a0ce0110ba1b8f60580f8823be3597c563bae868088ed5a0d2461d4892d8cdda55e11dcef71e3ce3c6cd89ab0c48f4900d104c36b6e67d53cf981cfa6f8cd6
+DIST youtube-dl-2016.08.19.tar.gz 2329613 SHA256 9094084dceeeea47da3f8a3071c608b81e28f7c1e8c9b3e92da6b55aeeae961f SHA512 db9e6301b28e0904bd1b002e06ae10cbd0ff54907af33f100220e58817ba68728ce28c60620a307228fed9d97e34e53ed25c2b7aad71e92fe1d99fc71d308378 WHIRLPOOL a52048a65359d860c8ab23734ba004558d32f4813e3fd702606c753d23718194923373f984b7d52a2c5cbac116fe9a3c3e5e86c0ca8cb2596db24bb541248046
diff --git a/net-misc/youtube-dl/youtube-dl-2016.08.12.ebuild b/net-misc/youtube-dl/youtube-dl-2016.08.19.ebuild
similarity index 100%
rename from net-misc/youtube-dl/youtube-dl-2016.08.12.ebuild
rename to net-misc/youtube-dl/youtube-dl-2016.08.19.ebuild
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 68179c8a1911..00567bebb131 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,3 +1,3 @@
 DIST haproxy-1.5.14.tar.gz 1345345 SHA256 9565dd38649064d0350a2883fa81ccfe92eb17dcda457ebdc01535e1ab0c8f99 SHA512 83d6101fd402f37845ab3febc914335e4c6d9bdebbb0ff81c8e048d5252ffa5a1b77c4250a434fed5dd541ef1f1f2c47d969b59f7a51d6ab9aea38a8646a9798 WHIRLPOOL 7d2c580589b9b31e1eba169e4bf930ac42d2564e21eb1c25adbdd39b701abd221fd671ebc227167ab956a48b2c30eeb740a6394355a8fa748c408ee42fdff6fc
 DIST haproxy-1.5.18.tar.gz 1360582 SHA256 14a5684d85cf65c34a8d441afff2aaa4dd9b4234e81b3d4ddd242e6e7c97257e SHA512 b4f85986a6b1e0d152b643f576a0ff770fbc190457d3e0130fbb923ff9bf4d00b634e64edf0eadd5b47d0eb758fd9f6ecf33907fc4c21150a518064df954e7d0 WHIRLPOOL 5faf0aec42332564a3c392b0bbca25dc56c6a754672e1853ca765fc5d95d9ca963cd041dc705bbb38085a3da77219adf061966f2caa209e327ff02f3ee8fde3b
-DIST haproxy-1.6.7.tar.gz 1565243 SHA256 583e0c0c3388c0597dea241601f3fedfe1d7ff8c735d471831be67315f58183a SHA512 fba060517aa316c3c66ac709c4b718cba7d265565ce191f8b022410a5c1c34ca8383b18e3ad6b6f8d1d9ee7648768b0bf1cd76ad3de3449144b0529dc16fcd00 WHIRLPOOL 73eede3745213adb9915898ff1cdfb6798e6716547b1d888785e1da3653b2ad7068c76299dda3ba19a8cd5cf0addf97e841b6f2b6c4741a52c3402a94f96f56c
+DIST haproxy-1.6.8.tar.gz 1566594 SHA256 a51b7bf667245369683f8aafb288c4e33cb55d36c4b4b836f1dfc9aa56bb095c SHA512 692f93e0abf4ba457f74c25a17940ed855f39cbc50b4a4912e066cc8299cba5ba95d90dae98af95fbfa73b5b2fbb6ad21da7b6fa91cde7a91754f17f5bc332a3 WHIRLPOOL 1ecfced926da5c582bfe38fc20815bf57209c3c8afe5284a38c1e3e9446941993c8c3b2c9ba8b67256adf3c507d365fce02ab4ce175bbb411817b7753dee1a1c
diff --git a/net-proxy/haproxy/haproxy-1.6.7.ebuild b/net-proxy/haproxy/haproxy-1.6.8.ebuild
similarity index 100%
rename from net-proxy/haproxy/haproxy-1.6.7.ebuild
rename to net-proxy/haproxy/haproxy-1.6.8.ebuild
diff --git a/profiles/desc/l10n.desc b/profiles/desc/l10n.desc
index fda1388ef058..a92f9d83a134 100644
--- a/profiles/desc/l10n.desc
+++ b/profiles/desc/l10n.desc
@@ -52,6 +52,7 @@ dz - Dzongkha
 el - Modern Greek
 en - English
 en-GB - English (United Kingdom)
+en-US - English (United States)
 en-ZA - English (South Africa)
 eo - Esperanto
 es - Spanish
@@ -67,6 +68,7 @@ fi - Finnish
 fil - Filipino
 fo - Faroese
 fr - French
+fr-CA - French (Canada)
 fy - Western Frisian
 ga - Irish
 gd - Scottish Gaelic
@@ -94,13 +96,14 @@ ko - Korean
 kok - Konkani (macrolanguage)
 ks - Kashmiri
 ku - Kurdish
-ky - Kyrgyz (Kirghiz) locale
+ky - Kyrgyz (Kirghiz)
 la - Latin
 lb - Luxembourgish
 lo - Lao
 lt - Lithuanian
 lv - Latvian
 mai - Maithili
+me - Montenegrin (Crnogorski)
 mi - Maori
 mk - Macedonian
 ml - Malayalam
@@ -141,9 +144,9 @@ sl - Slovenian
 son - Songhai languages
 sq - Albanian
 sr - Serbian
-sr-ijekavsk - Serbian (Ijekavian pronunciation)
 sr-Latn - Serbian (Latin script)
 sr-Latn-ijekavsk - Serbian (Latin script, Ijekavian pronunciation)
+sr-ijekavsk - Serbian (Ijekavian pronunciation)
 ss - Swati
 st - Southern Sotho
 sv - Swedish
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 9630df8aeae9..2c90d580fbdf 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -5853,7 +5853,7 @@ net-libs/ptlib:wav - Enable WAVFILE support
 net-libs/qxmpp:opus - Enable Opus codec support via media-libs/opus
 net-libs/qxmpp:vpx - Enable VP8 codec support via media-libs/libvpx
 net-libs/rabbitmq-c:tools - Builds cli tools to interact with brokers
-net-libs/rb_libtorrent:dht - Enable DHT (distributed hash table) support for libtorrent
+net-libs/rb_libtorrent:dht - Enable DHT (distributed hash table) support
 net-libs/rest:gnome - Extract proxy information using net-libs/libsoup-gnome
 net-libs/telepathy-qt:farstream - Enable support for audio/video calls via farstream
 net-libs/tox:av - Adds support for audio and video.
diff --git a/sci-physics/hoomd-blue/Manifest b/sci-physics/hoomd-blue/Manifest
index b6969d68fa2f..efdfd160fd2a 100644
--- a/sci-physics/hoomd-blue/Manifest
+++ b/sci-physics/hoomd-blue/Manifest
@@ -1,3 +1,2 @@
-DIST hoomd-blue-1.0.2.tar.bz2 2755462 SHA256 bca7d377fa152b5f99047c5701db0fecb244f56a7861c35eef0ded6106c520d1 SHA512 f9042e3afacc14e62490802d16a13a77592195befa61837703a39aeedf679e81f31aaafb377384d3b0a2f0e9e40dbce7ddd8b2673086706ba223fe265a2dff27 WHIRLPOOL b72c12a88941899c7a51a0a8e78783bf8c108b85f3969663453b2048a9a9c43ab8d4fd3fbcefa0a6d3add47ac880a2462d92760dc9efc5dd7a822be0252bce19
-DIST hoomd-blue-2.0.1.tar.bz2 3208100 SHA256 432cba74cde199f178dfadf7467738d356b83e1d5026c6c83c23880898c76019 SHA512 1edb634fd714c07401df98e6897c37638ac0a7205c10f9063866b2e759a550f5655cef2a62911020d22c7d089a5ab84456f6f7e05677f82bc37532389693ded7 WHIRLPOOL eb78fd60683591e913d0623f980486049cd69bb280724151f0158076863637b824bf29d522b03cb8a2ec9b246c5540553a5b3b65c9454a009529d261bd1a3130
+DIST hoomd-blue-2.0.2.tar.bz2 2942198 SHA256 6ed0b7c28d4490a00081630fe9afd831a862cb895636679b89e2fb0a11637861 SHA512 6480639bc1b8d0534c220c7512f742a6f9eba76ad25991153735cc7f4ff88345332be4c215abd94de85249e79e85a6970be1a74a96350d4693a2c1291fbbf689 WHIRLPOOL e0a9e23a1a5aa8348496400140e4e288a3b79c5bd7f3c09675d592aebd02a781d4ef6cc9e5fe7ac9f671e1ff791ea75d70d3fa25189ade78d9229dfae6e9a21a
 DIST libgetar-0.5.0.tar.bz2 217067 SHA256 8b03a352f63dcf8d14e88af758f65f71e5e4f92ed01c1566c3333da90164ab42 SHA512 a27de8f7c976e5578142319684de15afca47c24953f590b34cad4ef88c3778aa47aa5eb9a1f83b1473aa49f4394e45dfaa4a8b5107264fa93101dea78ec5fa6b WHIRLPOOL d5dbb0bc51bdc7241ba4c51461da0a54eb57b0e9f76e1f0a7127010ccbd375146b4aae0bfd98a431f96595459913168097502edc9d7fe60f3180ca56fb44e91a
diff --git a/sci-physics/hoomd-blue/hoomd-blue-1.0.2.ebuild b/sci-physics/hoomd-blue/hoomd-blue-1.0.2.ebuild
deleted file mode 100644
index 63ea837ee4af..000000000000
--- a/sci-physics/hoomd-blue/hoomd-blue-1.0.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit cmake-utils cuda python-single-r1
-
-DESCRIPTION="a general-purpose particle simulation toolkit"
-HOMEPAGE="http://codeblue.umich.edu/hoomd-blue/"
-
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://bitbucket.org/glotzer/${PN}.git"
-	inherit git-r3
-	KEYWORDS=
-else
-	inherit vcs-snapshot
-	SRC_URI="https://bitbucket.org/glotzer/${PN}/get/v${PV}.tar.bz2 -> ${P}.tar.bz2"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="hoomd-blue"
-SLOT="0"
-IUSE="cuda doc test mpi +zlib"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	mpi? ( virtual/mpi )
-	cuda? ( dev-util/nvidia-cuda-sdk )
-	zlib? ( sys-libs/zlib )
-	dev-libs/boost:=[threads,python,mpi,${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	use cuda && cuda_src_prepare
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable mpi MPI)
-		$(cmake-utils_use_enable doc DOXYGEN)
-		$(cmake-utils_use_enable cuda CUDA)
-		$(cmake-utils_use_enable zlib ZLIB)
-		$(cmake-utils_use_build test BUILD_TESTING)
-		-DPYTHON_SITEDIR=$(python_get_sitedir)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/hoomd-*doc* )
-	cmake-utils_src_install
-
-	sed -i "s/^python/${EPYTHON}/" "${ED}"/usr/bin/hoomd || die
-}
diff --git a/sci-physics/hoomd-blue/hoomd-blue-2.0.1.ebuild b/sci-physics/hoomd-blue/hoomd-blue-2.0.2.ebuild
similarity index 67%
rename from sci-physics/hoomd-blue/hoomd-blue-2.0.1.ebuild
rename to sci-physics/hoomd-blue/hoomd-blue-2.0.2.ebuild
index 30fe9f36fa21..d7a2cd95ea3d 100644
--- a/sci-physics/hoomd-blue/hoomd-blue-2.0.1.ebuild
+++ b/sci-physics/hoomd-blue/hoomd-blue-2.0.2.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
-inherit cmake-utils cuda flag-o-matic python-single-r1
+inherit cmake-utils cuda python-r1
 
 DESCRIPTION="a general-purpose particle simulation toolkit"
 HOMEPAGE="http://codeblue.umich.edu/hoomd-blue/"
@@ -21,7 +21,6 @@ else
 	GETTAR_VER=0.5.0
 	SRC_URI="https://bitbucket.org/glotzer/${PN}/get/v${PV}.tar.bz2 -> ${P}.tar.bz2
 		https://bitbucket.org/glotzer/libgetar/get/v${GETTAR_VER}.tar.bz2 -> libgetar-${GETTAR_VER}.tar.bz2"
-	PATCHES=( "${FILESDIR}/${P}-cxx11.patch" )
 	KEYWORDS="~amd64"
 fi
 
@@ -44,13 +43,28 @@ src_prepare() {
 }
 
 src_configure() {
-	local mycmakeargs=(
-		-DENABLE_MPI=$(usex mpi)
-		-DENABLE_CUDA=$(usex cuda)
-		-DBUILD_TESTING=$(usex test)
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DCMAKE_INSTALL_PREFIX=$(python_get_sitedir)
-		-DUPDATE_SUBMODULES=OFF
-	)
-	cmake-utils_src_configure
+	src_configure_internal() {
+		local mycmakeargs=(
+			-DENABLE_MPI=$(usex mpi)
+			-DENABLE_CUDA=$(usex cuda)
+			-DBUILD_TESTING=$(usex test)
+			-DUPDATE_SUBMODULES=OFF
+			-DPYTHON_EXECUTABLE="${PYTHON}"
+			-DCMAKE_INSTALL_PREFIX=$(python_get_sitedir)
+		)
+		cmake-utils_src_configure
+	}
+	python_foreach_impl src_configure_internal
+}
+
+src_compile() {
+	python_foreach_impl cmake-utils_src_make
+}
+
+src_test() {
+	python_foreach_impl cmake-utils_src_test
+}
+
+src_install() {
+	python_foreach_impl cmake-utils_src_install
 }
diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest
index 1e11e68ba6d7..897fb95862fb 100644
--- a/sci-visualization/paraview/Manifest
+++ b/sci-visualization/paraview/Manifest
@@ -1,3 +1,4 @@
 DIST ParaView-v4.1.0-source.tar.gz 50460304 SHA256 80ef898c158d7fd9ceb0bcd83be1f679eef06ce4f20514a2435330cc97a3fdf3 SHA512 da91f7332a91746d60968a9d6cc1fe4878a3710f8e4a3d675dc65c337d6844f39df4c3e307d424ee0d2a832fd3c0f3d0c4da6a8b0a2aa6902920988fb53b9f7f WHIRLPOOL c3572d12f05b8443eb21a342c140d55e3c41e2af383aa850491aaeec412e62a45a4ee44e6d772dc9b6f141028911cb96b22a7818c6f15bc80bb8553d37008d96
 DIST ParaView-v4.4.0-source.tar.gz 58397252 SHA256 c2dc334a89df24ce5233b81b74740fc9f10bc181cd604109fd13f6ad2381fc73 SHA512 092dee4ca75b9f4e3b4a53c85ebc89f406a91f6dd9ac9a3deb65de776189c2582d15c2b1f8f0393ff4d7a438333f8801de22d2cf916b314d8b85d93cc5f4671e WHIRLPOOL 722be36c45563066a2e91e7ea3e382d6928056a38c01920089f6e16a721259e1e8f99b26c982f136f9cfac8f1cb1d9f54ee0267cea79360ace4c00e81a47e61b
 DIST ParaView-v5.1.0.tar.gz 51613148 SHA256 1ce345e9c5533c2854ad7e89cf4f90992bafee23707ae9f85d12b38405169f2a SHA512 c9af27d8be03783c7353735718a41ee03732db0f2e4f6e2db5e1e72d3df01801bb77294713c2b96eaf17e75d1fd6a30e340b3c33f496f7e705d07badfa196e69 WHIRLPOOL 08cd669f02fd54b7fc4054f23f04a3dc274e4ba8ebdf54fb14caaa95bc0c9fb2e2e5551a9e74d88062f2230eb511b7e18d6cb75bb43f4291e19dbaa2ed53cd1f
+DIST ParaView-v5.1.2.tar.gz 51635420 SHA256 ff02b7307a256b7c6e8ad900dee5796297494df7f9a0804fe801eb2f66e6a187 SHA512 9204732ecbe5048c96536a2d63f37ec51f331416bab11c982797d07cd0233e1424193d1c8cac6dfe7e91696997f8aaf92c3a32d7b05674c0b176d93444672e40 WHIRLPOOL 1bbb95672279317304dde1f3123a51f3ca787f0f0b1a28ce09e53f0fbfdf685da89efeb2b13c0409982cbc5566e3984542eeeb519aa757bdd849186135c57a64
diff --git a/sci-visualization/paraview/paraview-5.1.0-r1.ebuild b/sci-visualization/paraview/paraview-5.1.0-r1.ebuild
index 772bb85df3a2..23fa29591130 100644
--- a/sci-visualization/paraview/paraview-5.1.0-r1.ebuild
+++ b/sci-visualization/paraview/paraview-5.1.0-r1.ebuild
@@ -70,6 +70,7 @@ RDEPEND="
 		dev-qt/qthelp:5
 		dev-qt/qtopengl:5
 		dev-qt/qtsql:5
+		dev-qt/qttest:5
 		dev-qt/qtwebkit:5
 		dev-qt/qtx11extras:5
 	)
diff --git a/sci-visualization/paraview/paraview-5.1.2.ebuild b/sci-visualization/paraview/paraview-5.1.2.ebuild
new file mode 100644
index 000000000000..38dc364f7037
--- /dev/null
+++ b/sci-visualization/paraview/paraview-5.1.2.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils cmake-utils multilib python-single-r1 toolchain-funcs versionator
+
+MAIN_PV=$(get_major_version)
+MAJOR_PV=$(get_version_component_range 1-2)
+MY_P="ParaView-v${PV}"
+
+DESCRIPTION="ParaView is a powerful scientific data visualization application"
+HOMEPAGE="http://www.paraview.org"
+SRC_URI="http://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.gz"
+RESTRICT="mirror"
+
+LICENSE="paraview GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="boost cg coprocessing development doc examples ffmpeg mpi mysql nvcontrol openmp plugins python +qt5 sqlite tcl test tk"
+RESTRICT="test"
+
+REQUIRED_USE="python? ( mpi ${PYTHON_REQUIRED_USE} )
+	mysql? ( sqlite )" # "vtksqlite, needed by vtkIOSQL" and "vtkIOSQL, needed by vtkIOMySQL"
+
+RDEPEND="
+	dev-libs/expat
+	>=dev-libs/jsoncpp-0.10.1
+	dev-libs/libxml2:2
+	dev-libs/protobuf
+	media-libs/freetype
+	media-libs/libpng:0
+	media-libs/libtheora
+	media-libs/tiff:0=
+	sci-libs/hdf5[mpi=]
+	>=sci-libs/netcdf-4.2[hdf5]
+	>=sci-libs/netcdf-cxx-4.2:3
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXt
+	coprocessing? (
+		plugins? (
+			dev-python/PyQt5
+			dev-qt/qtgui:5
+		)
+	)
+	ffmpeg? ( virtual/ffmpeg )
+	mpi? ( virtual/mpi[cxx,romio] )
+	mysql? ( virtual/mysql )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/sip[${PYTHON_USEDEP}]
+		dev-python/twisted-core
+		dev-python/zope-interface[${PYTHON_USEDEP}]
+		mpi? ( dev-python/mpi4py )
+		qt5? ( dev-python/PyQt5[opengl,webkit,${PYTHON_USEDEP}] )
+	)
+	qt5? (
+		dev-qt/designer:5
+		dev-qt/qtgui:5
+		dev-qt/qthelp:5
+		dev-qt/qtopengl:5
+		dev-qt/qtsql:5
+		dev-qt/qttest:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtx11extras:5
+	)
+	sqlite? ( dev-db/sqlite:3 )
+	tcl? ( dev-lang/tcl:0= )
+	tk? ( dev-lang/tk:0= )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.3.1
+	boost? ( >=dev-libs/boost-1.40.0[mpi?,${PYTHON_USEDEP}] )
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then
+		eerror "For USE=openmp a gcc with openmp support is required"
+		eerror
+		return 1
+	fi
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	PVLIBDIR=$(get_libdir)/${PN}-${MAJOR_PV}
+}
+
+src_prepare() {
+	# see patch headers for description
+	epatch "${FILESDIR}"/${PN}-4.0.1-xdmf-cstring.patch \
+		"${FILESDIR}"/${PN}-4.3.1-fix-development-install.patch \
+		"${FILESDIR}"/${PN}-4.4.0-removesqlite.patch
+
+	# lib64 fixes
+	sed -i \
+		-e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \
+		 VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/CMakeLists.txt || die
+	sed -i \
+		-e "s:\/lib\/python:\/$(get_libdir)\/python:g" \
+		 VTK/ThirdParty/xdmf2/vtkxdmf2/CMake/setup_install_paths.py || die
+	sed -i \
+		-e "s:lib/paraview-:$(get_libdir)/paraview-:g" \
+		CMakeLists.txt \
+		Plugins/SciberQuestToolKit/CMakeLists.txt \
+		ParaViewConfig.cmake.in \
+		CoProcessing/PythonCatalyst/vtkCPPythonScriptPipeline.cxx \
+		ParaViewCore/ClientServerCore/Core/vtkProcessModuleInitializePython.h \
+		ParaViewCore/ClientServerCore/Core/vtkPVPluginTracker.cxx \
+		Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt \
+		Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt || die
+
+	# no proper switch
+	use nvcontrol || {
+		sed -i \
+			-e '/VTK_USE_NVCONTROL/s#1#0#' \
+			VTK/Rendering/OpenGL/CMakeLists.txt || die
+	}
+}
+
+src_configure() {
+	if use qt5; then
+		export QT_SELECT=qt5
+	fi
+
+	# VTK_USE_SYSTEM_QTTESTING
+	# PARAVIEW_USE_SYSTEM_AUTOBAHN
+	local mycmakeargs=(
+		-DPV_INSTALL_LIB_DIR="${PVLIBDIR}"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include
+		-DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so
+		-DOPENGL_gl_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGL.so
+		-DOPENGL_glu_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libGLU.so
+		-DBUILD_SHARED_LIBS=ON
+		-DCMAKE_COLOR_MAKEFILE=TRUE
+		-DCMAKE_USE_PTHREADS=ON
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DPARAVIEW_USE_SYSTEM_MPI4PY=ON
+		-DPROTOC_LOCATION=$(type -P protoc)
+		-DVTK_Group_StandAlone=ON
+		-DVTK_RENDERING_BACKEND=OpenGL2
+		-DVTK_USE_FFMPEG_ENCODER=OFF
+		-DVTK_USE_OFFSCREEN=TRUE
+		-DVTK_USE_SYSTEM_EXPAT=ON
+		-DVTK_USE_SYSTEM_FREETYPE=ON
+		-DVTK_USE_SYSTEM_GL2PS=OFF
+		-DVTK_USE_SYSTEM_HDF5=ON
+		-DVTK_USE_SYSTEM_JPEG=ON
+		-DVTK_USE_SYSTEM_JSONCPP=ON
+		-DVTK_USE_SYSTEM_LIBXML2=ON
+		-DVTK_USE_SYSTEM_NETCDF=ON
+		-DVTK_USE_SYSTEM_OGGTHEORA=ON
+		-DVTK_USE_SYSTEM_PNG=ON
+		-DVTK_USE_SYSTEM_PROTOBUF=ON
+		-DVTK_USE_SYSTEM_TIFF=ON
+		-DVTK_USE_SYSTEM_TWISTED=ON
+		-DVTK_USE_SYSTEM_XDMF2=OFF
+		-DVTK_USE_SYSTEM_ZLIB=ON
+		-DVTK_USE_SYSTEM_ZOPE=ON
+		# force this module due to incorrect build system deps
+		# wrt bug 460528
+		-DModule_vtkUtilitiesProcessXML=ON
+		)
+
+	# TODO: XDMF_USE_MYSQL?
+	# VTK_WRAP_JAVA
+	mycmakeargs+=(
+		$(cmake-utils_use development PARAVIEW_INSTALL_DEVELOPMENT_FILES)
+		$(cmake-utils_use qt5 PARAVIEW_BUILD_QT_GUI)
+		$(usex qt5 "-DPARAVIEW_QT_VERSION=5" "")
+		$(cmake-utils_use qt5 Module_vtkGUISupportQtOpenGL)
+		$(cmake-utils_use qt5 Module_vtkGUISupportQtSQL)
+		$(cmake-utils_use qt5 Module_vtkGUISupportQtWebkit)
+		$(cmake-utils_use qt5 Module_vtkRenderingQt)
+		$(cmake-utils_use qt5 Module_vtkViewsQt)
+		$(cmake-utils_use qt5 VTK_Group_ParaViewQt)
+		$(cmake-utils_use qt5 VTK_Group_Qt)
+		$(cmake-utils_use !qt5 PQWIDGETS_DISABLE_QTWEBKIT)
+		$(cmake-utils_use boost Module_vtkInfovisBoost)
+		$(cmake-utils_use boost Module_vtkInfovisBoostGraphAlg)
+		$(cmake-utils_use mpi PARAVIEW_USE_MPI)
+		$(cmake-utils_use mpi PARAVIEW_USE_MPI_SSEND)
+		$(cmake-utils_use mpi PARAVIEW_USE_ICE_T)
+		$(cmake-utils_use mpi VTK_Group_MPI)
+		$(cmake-utils_use mpi VTK_XDMF_USE_MPI)
+		$(cmake-utils_use mpi XDMF_BUILD_MPI)
+		$(cmake-utils_use python PARAVIEW_ENABLE_PYTHON)
+		$(cmake-utils_use python VTK_Group_ParaViewPython)
+		$(cmake-utils_use python XDMF_WRAP_PYTHON)
+		$(cmake-utils_use python Module_vtkPython)
+		$(cmake-utils_use python Module_pqPython)
+		$(cmake-utils_use python Module_vtkWrappingPythonCore)
+		$(cmake-utils_use python Module_vtkPVPythonSupport)
+		$(cmake-utils_use python Module_AutobahnPython)
+		$(cmake-utils_use python Module_Twisted)
+		$(cmake-utils_use python Module_ZopeInterface)
+		$(cmake-utils_use python Module_vtkmpi4py)
+		$(usex qt5 "$(cmake-utils_use python Module_pqPython)" "-DModule_pqPython=OFF")
+		$(cmake-utils_use doc BUILD_DOCUMENTATION)
+		$(cmake-utils_use doc PARAVIEW_BUILD_WEB_DOCUMENTATION)
+		$(cmake-utils_use examples BUILD_EXAMPLES)
+		$(cmake-utils_use cg VTK_USE_CG_SHADERS)
+		$(cmake-utils_use mysql Module_vtkIOMySQL)
+		$(cmake-utils_use sqlite Module_vtksqlite)
+		$(cmake-utils_use coprocessing PARAVIEW_ENABLE_CATALYST)
+		$(cmake-utils_use ffmpeg PARAVIEW_ENABLE_FFMPEG)
+		$(cmake-utils_use ffmpeg VTK_USE_FFMPEG_ENCODER)
+		$(cmake-utils_use ffmpeg Module_vtkIOFFMPEG)
+		$(cmake-utils_use tk VTK_Group_Tk)
+		$(cmake-utils_use tk VTK_USE_TK)
+		$(cmake-utils_use tk Module_vtkRenderingTk)
+		$(cmake-utils_use tcl Module_vtkTclTk)
+		$(cmake-utils_use tcl Module_vtkWrappingTcl)
+		$(cmake-utils_use test BUILD_TESTING)
+		)
+
+	if use openmp; then
+		mycmakeargs+=( -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP )
+	fi
+
+	if use qt5 ; then
+		mycmakeargs+=( -DVTK_INSTALL_QT_DIR=/${PVLIBDIR}/plugins/designer )
+		if use python ; then
+			# paraview cannot guess sip directory properly
+			mycmakeargs+=( -DSIP_INCLUDE_DIR="${EPREFIX}$(python_get_includedir)" )
+		fi
+	fi
+
+	# TODO: MantaView VaporPlugin VRPlugin
+	mycmakeargs+=(
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AdiosReader)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_AnalyzeNIfTIIO)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ArrowGlyph)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_EyeDomeLighting)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_ForceTime)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_GMVReader)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_H5PartReader)
+		$(cmake-utils_use plugins RAVIEW_BUILD_PLUGIN_MobileRemoteControl)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_Moments)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_NonOrthogonalSource)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PacMan)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PointSprite)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_PrismPlugin)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_QuadView)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SLACTools)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SciberQuestToolKit)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SierraPlotTools)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_StreamingParticles)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_SurfaceLIC)
+		$(cmake-utils_use plugins PARAVIEW_BUILD_PLUGIN_UncertaintyRendering)
+		# these are always needed for plugins
+		$(cmake-utils_use plugins Module_vtkFiltersFlowPaths)
+		$(cmake-utils_use plugins Module_vtkPVServerManagerApplication)
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# set up the environment
+	echo "LDPATH=${EPREFIX}/usr/${PVLIBDIR}" > "${T}"/40${PN}
+
+	newicon "${S}"/Applications/ParaView/pvIcon-32x32.png paraview.png
+	make_desktop_entry paraview "Paraview" paraview
+
+	use python && python_optimize "${D}"/usr/$(get_libdir)/${PN}-${MAJOR_PV}
+}
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index b5d70ce52423..1009e269f380 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -1,3 +1,4 @@
+DIST moreutils-0.60.tar.gz 93137 SHA256 a095e9647ccde72d43a4d39ee215c6ac59a00b2cd1da17ccbcaf70e3923ae011 SHA512 b09b81606fc307abe26173fbd2e50ab3ee84db53b7242dc57a0747a83489088b1702435cfad5a171af00d56ab154b9d4c3062a3d4ac7c002dc03315c6fca0cab WHIRLPOOL 9d0183cf422a408957ccf027f5f141cae11ab5b99eaeff2b3a5949b88d87544b865a3466286a2e2208103bda7a91728f3ec5078361940d6ce3bc058277ba568a
 DIST moreutils_0.50.tar.gz 46952 SHA256 4df833f17c2c6781c1d500ac51455af1929db5aeb96d06e45b00489393b37714 SHA512 d83a0552693cf32509b5ea2bf781e5f415d6a78470200234f1f18197d2d1f7ffefb0eed0a5cb09737211dc35009d175cf261651a7d9af99ead7df2b2161b9e54 WHIRLPOOL ac74c23824d76e97b410bde0e345f358fa8817e55e94380bdb5b1906d4d737853885238bd346397cfbc4baa29e9e6a756c4c6b8c1c2af1e7a070da2d0841ab5a
 DIST moreutils_0.51.tar.gz 47404 SHA256 579e1e61f874d105ec3b6cf898a3ce7e487a58773a44769ce34c2fc7315cb141 SHA512 d81e2a51d5a7740590bebef7db929a0296f73fe3d58a58e3524cbe8392b3ba8c77769136327784bda0c23558a2b4109ec84c263a48abfa3a1fbdaeef12e877aa WHIRLPOOL 7fbbae5937ca9e634ba888fa99090c534f7c43618ab227f06725d68f36294816ecbdb2e81bdb66db95d2486ca39135f7ea86220dd793e2bbd36f6a6d4e25e79e
 DIST moreutils_0.52.tar.gz 47511 SHA256 c4bcf2f5bac09312ed5aa48d2cecd77a1c9609017b7a2acb2ac9fdd197480ffb SHA512 a2d9380bcaa1cefc1c1c744e71bf551fadeee4a76d7fac67051d4ca746e8f8df2a1c0a8e5721b430223958208189931168885777a5a0cb1ca66dc74421ef5b1b WHIRLPOOL e78fc1d9299e1dd2c333e895323566dac25cbe513d5ecddbfeee6104d1d925a4e67d3bcf1195dd4faf44b025e7619d15a4c257fc37150bc77bff42bfe9cb8b5a
diff --git a/sys-apps/moreutils/moreutils-0.60.ebuild b/sys-apps/moreutils/moreutils-0.60.ebuild
new file mode 100644
index 000000000000..b58a14ff9318
--- /dev/null
+++ b/sys-apps/moreutils/moreutils-0.60.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="a collection of tools that nobody thought to write when Unix was young"
+HOMEPAGE="http://joeyh.name/code/moreutils/"
+#SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.gz"
+SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux"
+IUSE="+doc +perl"
+
+RDEPEND="
+	perl? (
+		dev-lang/perl
+		dev-perl/IPC-Run
+		dev-perl/Time-Duration
+		dev-perl/TimeDate
+	)"
+DEPEND="
+	doc? (
+		dev-lang/perl
+		>=app-text/docbook2X-0.8.8-r2
+		app-text/docbook-xml-dtd:4.4
+	)"
+
+src_prepare() {
+	# don't build manpages
+	if ! use doc ; then
+		sed -i -e '/^all:/s/$(MANS)//' -e '/man1/d' Makefile || die
+	fi
+
+	# don't install perl scripts
+	if ! use perl ; then
+		sed -i -e '/PERLSCRIPTS/d' Makefile || die
+	fi
+
+	default
+}
+
+src_compile() {
+	tc-export CC
+	emake CFLAGS="${CFLAGS}" DOCBOOK2XMAN=docbook2man.pl PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" INSTALL_BIN=install install
+
+	# sys-process is more advanced than parallel from moreutils, rename it
+	if use doc; then
+		mv "${ED}"usr/share/man/man1/{,${PN}_}parallel.1 || die
+	fi
+	mv "${ED}"usr/bin/{,${PN}_}parallel || die
+}
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 657788a99d38..a61aced4e5e7 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
 DIST chromium-52.0.2743.116.tar.xz 458156660 SHA256 a194ae1edb041024b3d4b6ba438f32fefdb6f1ecb24a96c50248a486b237a101 SHA512 c9a8b6d7a22d3b086f1761678f1fa047191a8e44bc6ebe8745e76ea92420b1330fc6e4134ca7bc22c0367e7a25df04900156d0ebb44eae3ef7f98d1deb5362e5 WHIRLPOOL 90cc620e9dab964690a24606ae456e20f1a9dc556301fef33f3599a395ec247cb03712c94522a681f20332b54163896e118463b1b402aff6153b513deb25c5cc
-DIST chromium-53.0.2785.21.tar.xz 460600312 SHA256 68f4a97af24f0c1c964b6633338eab68ead815833b56ea9a9f925a5b3b35baef SHA512 8ccc84506ca47f0d8c77f542b1c0fe7e8f5b8849ce8378ef49a0b7916822bdc622f4e6a4a53b7c5e2b51b68d191e71b6b6757d2258d732103bca507cfc799e90 WHIRLPOOL 30404088b6e8cd572c9c3715ee0ba75c9823e3acea464c956fcd2f7deee2e375eca35ee10cd254b866ecd91e6653ba876893c4d5b810fbd39f9a1caa470217e6
 DIST chromium-53.0.2785.34.tar.xz 460739532 SHA256 261ba008c96b335a55feff18785b01484af2d678f85b58206008b31c9e9c372f SHA512 99e0b7a30e34f70ec844ef50f02eadadead2b83f2a47ca7d5779cf0a90bf49e7d3efc1bbc98eb4d1294ed283edd04a993a639003a365e06ae8b2adf26cc1c865 WHIRLPOOL dec533670c1664f88ea32fe253644e479b81fb93bd93f1bc5dbfe41c56979a7642afdfcd041ddf05ca3f0da8e1bedc7ddf48779be3b965038026f65ab199f344
+DIST chromium-53.0.2785.70.tar.xz 460838212 SHA256 edd660ea30eeb1a3fccb1c18c725c96bf464b6ea34134c8210ef9dfa8cd35179 SHA512 7029915f983f854ceb2e43b1bc896b2954eb2ca4f704a81070a837e2435ffd0f5a4e4128456826fc70e439997febb1eb715ed33b3336734f137952632f61dd7e WHIRLPOOL d6e51313b37c6408e6f41900b984f1cc835fb247dfb0371eaca9554425df5df2ae1d56e4efd31093c2ffcd0359b457338558ee8e66cd1a67f69528f5461cd5b2
 DIST chromium-54.0.2810.2.tar.xz 460923284 SHA256 f038e72cbd8b7383d13c286329623fda8d6d48f45fa2d964e554b5565283ad71 SHA512 069edcc27427dc7e3c6c3af1932b7d88d2070f8280c9e1881bcba3cbf13bd2d74fe13b79d1e89194c51b9edf71b8ff0f5e45a0a9727798cc723cb8237b95df8c WHIRLPOOL 64b32d5b5c06f9a4d3e774d340da935b92c46bb1573923dfd4f5748af310214ff7295f1b1e101dd6cb50de383e36fd2813087af801bed47df889e69441a6a375
 DIST chromium-54.0.2824.0.tar.xz 459683224 SHA256 7aae8ea2ae681b6971624c1dbcbf9cb56353456a20b91f369381488c8f2e0e94 SHA512 4867661f78fe72c32e8cea5a476cedd5fee9586fe8df8a7bd79f793542caa15fe52596996f8615f66376e75d9bdd92aeaa8aa6241472503ae015ef761f6435a3 WHIRLPOOL 88baed0d7fb13b815df82ffcd5e511ac9ef6ee92d98dff571f5ba5115300859345490c27fa45dab7c3dc99e5cd44310bcaa502ae37808b8694ce1276293d3549
diff --git a/www-client/chromium/chromium-53.0.2785.21.ebuild b/www-client/chromium/chromium-53.0.2785.70.ebuild
similarity index 99%
rename from www-client/chromium/chromium-53.0.2785.21.ebuild
rename to www-client/chromium/chromium-53.0.2785.70.ebuild
index ad4ba42de5d9..1fa5fbb8dd0b 100644
--- a/www-client/chromium/chromium-53.0.2785.21.ebuild
+++ b/www-client/chromium/chromium-53.0.2785.70.ebuild
@@ -439,7 +439,7 @@ src_configure() {
 
 	if [[ $(tc-getCC) == *clang* ]]; then
 		myconf_gyp+=" -Dclang=1"
-		myconf_gn+=" is_clang=true"
+		myconf_gn+=" is_clang=true clang_base_path=\"/usr\" clang_use_chrome_plugins=false"
 	else
 		myconf_gyp+=" -Dclang=0"
 		myconf_gn+=" is_clang=false"
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index a64c702deb89..467ec59062b7 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,4 +1,6 @@
 DIST opera-beta_40.0.2308.11_amd64.deb 48262760 SHA256 b1c52a582f5097a575008d480bc68158582746e981ae80fc8be942cabda5c596 SHA512 87bb63cb1f4d24f8d41f30692cf6c244ef3ff04d9e3724b447537ea99f2542b6828c853b32c4b1a6238bf05106153de6d9d9cb2ef7300449170cc6819c676318 WHIRLPOOL 1ed9caafd22f9bd7c2be9baf04e4fbaf8f67df0dcfee3b05f09a9472fb59f98c6ad3537a3b3f939d11be33b887888a47e89278da2c77f48f774218887d50db58
 DIST opera-beta_40.0.2308.11_i386.deb 49359880 SHA256 a250a87c779491290892cd4d036e38644d551a24dc760fa04f1fae9047befce9 SHA512 e0ec340452eaee5724e9b79af151076391a0be2fa36c4e2a49e1f4762948b05d2047e793fa5a86068fed36c24d24155f512d5201b0c8c9ef590058a59efdb51d WHIRLPOOL fc43c0b4b1f65644c2b5265f6ce903d28cd4604bf637195e3f09d9efaacbe46376120245dd8212d5608d2a57aa1d72a7838b5961c066637c13a8a2966afa9c53
+DIST opera-beta_40.0.2308.15_amd64.deb 48257698 SHA256 85bca35d641ce9c431b36fb5c9d3e75e1aa4c3264fb6ea3ca9e6ac9612feaa0d SHA512 5a113e0348e3371bb9502a8c738e9d8ae84b8d4d889a233561bd1f3f22e0170b3c3c579656f5f48103333a6450f71020b134828fdd2657c1980743ceb9955837 WHIRLPOOL 60bc4bbca6bcb1c20f1095ccf3ef8ac3bf653817a9b0ca87f42690cb7a3e0acb91fd91008be9bdbced3e33a87236347c92e53edc13b49783e2c9bb89c24f1237
+DIST opera-beta_40.0.2308.15_i386.deb 49314244 SHA256 e7f5180b19a05ef6ea3714bbf53bad1e353edf97b8715f78e933feac3e95bad8 SHA512 f4cf28113ff841fdc444888e21deca822bf17f8d9cfc68c76e157ae680476115e179a40aa85c1e2c4625586003b641d027bdfc3fcc49239ee84ba4bdc1567808 WHIRLPOOL bd27829ed51b57bbc6b8e5186faf6728bda071706218055934649fdfbbc4d1a2f77dac9824c592cbbc0cd0cc9a9033915eac50a17df42fa5eded8465f339d4fe
 DIST opera-beta_40.0.2308.3_amd64.deb 48272008 SHA256 a51609b065df9f5fcdf4224d07887a2038aa28c4b9ad3adae6f0bcda055f2b6e SHA512 344bee524d20a3f312f7f6f7f2bbb177b25b7d538ebb7fb797deaf93a9baf50d978819a71cf7c2b33aabedb8ef755fcccd0612acfc0b506cda492b3a733da01a WHIRLPOOL 97dfd744f36cf874d09d729885afd2217a840eaaa79f284883e3012f7f87b4de9fc3a4f62c43922ddcaf38eac8b77caa08dd93ca199e151ccdf2ec39b6ea0e11
 DIST opera-beta_40.0.2308.3_i386.deb 48746218 SHA256 c551d043718c376fb5099619aee44971164465d300ec76e82b56d88d88b9f15b SHA512 c658797cfa20bc02bce3e4fca6f2e9f8f576805b4aa27fc9d9290885a50242472a04f27a37883ed93a1f9e7473610d73738e48031bb4d53553144271d3d972ae WHIRLPOOL a25aa38bc03b2bd62e0b00c906d4cd2e1bb35dbf750ad3a3d40f43c42bb4b112c802ecaef13fd7acaeda29effcf1473303738081c509c5309888564b0ff3517a
diff --git a/www-client/opera-beta/opera-beta-40.0.2308.15.ebuild b/www-client/opera-beta/opera-beta-40.0.2308.15.ebuild
new file mode 100644
index 000000000000..30ad38b623d9
--- /dev/null
+++ b/www-client/opera-beta/opera-beta-40.0.2308.15.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CHROMIUM_LANGS="
+	af az be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr fy gd
+	he hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt-BR pt-PT ro ru
+	sk sr sv sw ta te th tr uk uz vi zh-CN zh-TW zu
+"
+inherit chromium-2 multilib unpacker
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="http://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="http://get.geo.opera.com/pub/"
+SRC_URI="
+	amd64?	( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb" )
+	x86?	( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_i386.deb" )
+"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+OPERA_HOME="usr/$(get_libdir)/${PN}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	rm usr/bin/${PN} || die
+
+	rm usr/share/doc/${PN}/copyright || die
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}