gentoo resync : 07.01.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-01-07 18:44:07 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-01-07 18:44:07 +0000
commit: 5001a6c7b6da2956f5b17c695b1e0059dc7b8de5 (patch)
tree: 0528a53855a7ec96d20cde9edb9031aab030224c
parent: a8b0d35ab742f31538d515dea39716e566d533c0 (diff)
847 files changed, 5174 insertions, 4170 deletions
diff --git a/Manifest b/Manifest
index 173fb880c58f..3b00f75d2dfb 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28815 BLAKE2B a97bca5db28cc6b890d2c73cf8031d361ca870bacb47edfe08d62f68c4cb692096b0338725c4ba10ade8b36dead03bc0cee2094d481051cc072ea05e289a7810 SHA512 54150f8dd195c0e56a5261c2dffa5aad99f88e70d3bff04653fe3e8699cfd4555d2918ccb7fabbfe8f2e052b7b238fab7490327240aefbe79f1a2faf671b372c
-TIMESTAMP 2018-01-06T22:09:07Z
+MANIFEST Manifest.files.gz 28864 BLAKE2B 1507f7239d9ac063e16b6ea890c94bccd2f0fddefcd049381d4783037fab2dce64ce5e4e070f74a7831fe7ad9e7b4bcc16b69bbd48a80fabad5158a4ddadd082 SHA512 318dfaf93946306ba7467a4e6f5ed3b3cc2e271645988ea4ed69dea812baec96bbc4ef30400741372e1a6b0f3387ae468d806e0a796203a38e6dfa4ab13ca514
+TIMESTAMP 2018-01-07T17:39:13Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpRSQNfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpSW0FfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCtLA//Q/GXODfappTW5szCxfMJGXSicqVlZmCJ89fnuJF7f5iTfcV8r5EywsrP
-QujiDfvaxdlFw3sF2yDKjg5BmF1gm1JRJ5ZacbdE/l1AhP8wPllLPb4S9DKeixwe
-dkya2x5xIsq+ZJri0ofNt8g5dGNpE4USTPjKmfGD00LG12AvB8Q6Ex6wUhRIf7v3
-TFSAN+TWHQg3MGIxf1IQtJ7ihxlbz1Mg6PZAuZKyPWKXGtsxFefRTX+/Iy2fcmnI
-FUBVgyFMZ8y+METJji+N4wVJMmi2AdnP69Eu95Kc6v7a/NIgbFMG+Gs9Qc2QtoDv
-yp7d6kYghsPOszzsRirY3cVyLjxIhPwZYk8yvC2ls1Y+L6gVBt5wswAW3Rrmwvso
-D54ZJDAxmMrAFf1p05TZsLqF742BeepTnA4zZrKBOP5S3/T/Z3CHd7T9DL8zzg0r
-pplghETIc3KSzCrM+n3DvV/4tDwt5qpKOgoBQq4m+sb+ggjsJ5Zl7PesEkiFnWAN
-R5RZ0vMbkJMBUZ4yDkNxDIhymQqO55ii0OQ9chbpk7vUcCgZIeFOqisZSpiIvh4Q
-HN9iHEzQOU38ZadrgCgMETjd0UbdalCkREe4ve6zULbRVSO7oN7i64gmlzAl22+d
-89/MyBBtlbBvFTifLKeGlh5cHeqWLXBlopmMrwzxrQwycubjywk=
-=bwjg
+klC3/g//cYCZ/mfQrhFaxwxEuNzuzRdj9smz/kPk6HWO2Qe8pXConp1tsbqxs8Yd
+MfVAmQIohurgq+D2ICEf/S4+stIEQKUB4br1U3/9PXaBWKA2G4q/tjdbgp0r5V1Y
+6iuFYxGtHEsIiKZkSlb/pQyfXI0H47gKjUd8aRGBNwDaBi0woTgAkiZRTnAZgopA
+QqrJwbqtLd7JTa65Og9shl3Ic5dZHePpMfA2VPq+KsYr5VrxmZfFKycLreKSpYBP
+94Qt9mLM4SoFrx3VyfA+rG+F5k+yfblCUC/MMoJxHJbCdQswEB6iUtxoUDRYnkrp
+uNgDdamIEYsvGjhu435HzByD+T7SMgCYbNJnmK5jmMMLMsmlOK8knNpb39QofTNh
+uYvb45VkVf6GLmjfteUl1t6XuIOhjnJG7NYKsTP2Fb5uPzHGBu6uOazm1WJ1FHah
+PZrLMrqBjkhpMOvG7xw2TiUhKhUeJh8944cbZ2snER9/IqBOyAqqgvs1fNAxPtD8
+4VsI4PgDU3N3GFi8ukED3qpmc79y7C1CCovJgsYHO/If09MbJ1Jjimv0rzJmCklh
+ISjZtw6BiOus10s7+xPwz3HudFEwRtZDeIJNUzEqAC14KG3cqSveDxhFtbcGgg8J
+NuWb+FWvr1DGW+BwaxMN67bP4YijIzRpPinH4gQWH+oXi6nbk2o=
+=N+Kc
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 14a1c79106f1..bd22b343ce12 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f53061eec34a..7d8a7d715066 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 2b7fbc689afb..005471fd6391 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,6 +1,7 @@
 DIST ansible-2.4.1.0.tar.gz 6675552 BLAKE2B 00497b33e833149510669c9e481b0893a2d016caf2949fa064ca0a2e4f62a6c5a3f94597673822418253b85abaf380308115dfaa4c1acd88f0c73322d87822d4 SHA512 86bda43d912fc6b9cbf662e7e9e3ca3178ac577bc7857c5dfc0e68a7083d76ad405b0ca9b34f680a0d635b87e0bf5dc8cbdeefb93174242e1942eabb74b07f1d
 DIST ansible-2.4.2.0.tar.gz 6503595 BLAKE2B df4ec4e24671f1488950f2d9eb7705fbad4e035d6ac67d5017417281455cc44cde1290976a9ed16675c0cc19a9190200b95b29890725c56df5f2699398accd6b SHA512 32a075959dca01e184d9c3988fc9c491e904e7627a38e3527c37a8b26340f331bd294cacfe7353d339d15488857ba5ee1b36d9ae4ebeb8b5827934a73f4b42b0
 EBUILD ansible-2.4.1.0-r1.ebuild 1441 BLAKE2B c7d99a3d842b55015f0839ec115c341fd5e543c5b045573681a071d956fa74931135388f9cf081a26b80a40db0040fb63c2a6037d5cf496a5d39945eed955f2b SHA512 611e6a76d51e16fdfb0131862c39935938b439ed36e0bc5724bbc78f3944d9048e33c277120a6f681a647102c648dbcf2052f7008960cd97ee7afa133f16c41c
+EBUILD ansible-2.4.2.0-r1.ebuild 1406 BLAKE2B 9f63cd0a25a4ada0913f0e94c5dc221043936b60a0287d32668f3b9ede027f4b32695d527d5b6402252c5294e3bedc00d2ccdb3f8b0d8f892a9c6c003f81d73e SHA512 492cb42bc894ed7b07275828117689901b90574135397b73bbe9b7447a06df6024a18f9cc61bd48ac8d2f3ead9b0555ad79c708d275894725aa6ed1548a00fb7
 EBUILD ansible-2.4.2.0.ebuild 1445 BLAKE2B f00ce2aaff90cbdff9a6eee800a61bfca78491671a3b8e7c931fe8f24cced9b6b8bb5552f42d34b106d8b101173c373f4ee69f8dba8738936af3866e946164df SHA512 2f731321ff758ca6db6cd90701ae234cd63fb84f8dcfe730c6b2cf824fb8f801ceb174e1bde7b3f3e9d14723574ff5c18d5ca68c82b27192aef3d4b355df5ff0
-EBUILD ansible-9999.ebuild 1516 BLAKE2B 7035a4e11737fea1c9ab5256fe315214e73650630c4437f55febdf652e4900bd8bda1dee61e5e0a3084705910da86cdb29928e6088a42359669be531860c27ab SHA512 8e36c88f99ac27adc56de04d187daabf63278ca902ff4fae23317d5f5e900e856b2f65b6a44067cf5a0169d152d7467dd34c53751e34ab1bf86afabe479e873f
+EBUILD ansible-9999.ebuild 1475 BLAKE2B f2718a27295c6d9ce5ad4415573558ab2e651f52dae85ae9dc79a3e39e5692a29279b5d6a96166c91b7d0b1a389915848e7e9480979c4fa3e0878ae6b2fdc662 SHA512 a1c816593bb2052ce3f89c37fa44322b25af436bf6f3bbbfb8c87e1b1ed33aac880e8e3499fcbc52a0d0bd85db6ad0ac48a858400b1806ae4b61beb66a634244
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.4.2.0-r1.ebuild b/app-admin/ansible/ansible-2.4.2.0-r1.ebuild
new file mode 100644
index 000000000000..346b2f5aea95
--- /dev/null
+++ b/app-admin/ansible/ansible-2.4.2.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="http://ansible.com/"
+SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index 3470c23efa9c..9e8e5bb04c69 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,7 +36,6 @@ DEPEND="
 		${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
 		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		<dev-python/mock-1.1[${PYTHON_USEDEP}]
 		dev-python/passlib[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/unittest2[${PYTHON_USEDEP}]
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index cce86ee567eb..b135cec01488 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -10,6 +10,5 @@ AUX sysklogd.logrotate 402 BLAKE2B 2aba98bcef0516602268132507248ea44097541ac5659
 AUX sysklogd.rc7 1447 BLAKE2B 352be79eca7a99213557f29110a53eca85dfbc11e134eac48801b5d61ebca9e77beadbee10c7f86267fe3509e17352468f9f777d25a875d583292a409d5db071 SHA512 f3c8f00fbf65833735d57927fe25c6299103bbc0b8fa548103b4f2f06f0dc2aa2276f12326ff7477f4ba491a96ccd30fe01cc53e841b0ccee83c4dacabb5a94e
 DIST sysklogd-1.5.1.tar.gz 90011 BLAKE2B c40bd8d5769f7d3d4141d602c74ac41e05a140743d18c4923d9368da7ba193ccb89a6837173994f0b7a9c290cc23f64513040434d7ab8df81b5d09b73b0263ad SHA512 a72196a1a172d25be1c4791ef6256fe71fa2ba8c1383d230e646e93f8a65c3a57c535189726325da4c792fdb2e9cb119bba43c878816a8e78e78189fd32b12b7
 DIST sysklogd_1.5-6.diff.gz 25677 BLAKE2B 3cb1f596490998b6002d4656a2321a500ce9941a37737c0b9d4702bbb87d7bc9ba21b68e06d175e3c1714a701adc6b3312e18a556ebc9ef395d8968762830cb5 SHA512 816961a835a43057569f62fd20d9f7b5e0bfcfcb173b68947457708504db3ce47e635956c8a9564f9bd577d8f3c49dfc725d321dfd3370b2de918363c30f838e
-EBUILD sysklogd-1.5.1-r1.ebuild 1704 BLAKE2B 5a547a712115a85b7abb74940bb839a492bbef4afb369a3a034f6646dfe5e8d45d29de524d9e1f00aaef5242ca683139e7f006dbf78d40bd392048a0899e057e SHA512 def13485938930c8d0d773003c1137b01025322c153c360112d24f5e20be0917bdfe14405af201e8978d2e05d50752a01df1475c90f88f19b48543989c8194d3
-EBUILD sysklogd-1.5.1.ebuild 1640 BLAKE2B 311c01b14eee0be316ee7070eb88d2be4d772ad0062102a883ef02cb7467511620cca0cf243358422465160e46fc7b4349b0a2de3c340c024c65e62fa979828d SHA512 7608dbe2f695a63775e89022088cb4f191f3100475f90c6d5194568661b7b9171c16ff6499a8b7344de7da4499127c41c442261ba5955e60f39468b6e4452248
+EBUILD sysklogd-1.5.1-r1.ebuild 1703 BLAKE2B 1b5f75d79a86e05f3b7f71523f794a1bcf4cce6b0242dd8564204edcb886c1c9e7a450f25e00e3899f159643dc9d65da38d8c40fbe25becda0522359485b4347 SHA512 f7355db8d66f1b73b09381aa43f9d7112646229bf2a68facc9cf2a5fdf290f95adbc7bd48203473f7d2a21ba608c23aba267d0a5875c5f6b464bff5d1b2752de
 MISC metadata.xml 378 BLAKE2B b2ff06a70503694dcc5349aebb2d043cb74c10463e137c7bdd9ee6b5c1241e67fab49c201d08858b200a3007bea36e1d0ae1460e569b0b9e6f8281cf39c58c48 SHA512 9d7311cf197ebeec7e989d97d08a35360242ee0aa467e38e1715c6a425e1e279ddd75da8e2856c1238f357741d67bd67d07841425d7dcc3f8f964def8f02d15c
diff --git a/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild b/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
index 9e7367265160..ea099c26f115 100644
--- a/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
+++ b/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://www.infodrom.org/projects/sysklogd/download/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="logrotate"
 RESTRICT="test"
 
diff --git a/app-admin/sysklogd/sysklogd-1.5.1.ebuild b/app-admin/sysklogd/sysklogd-1.5.1.ebuild
deleted file mode 100644
index 99df849cf104..000000000000
--- a/app-admin/sysklogd/sysklogd-1.5.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DEB_PV="1.5-6"
-DESCRIPTION="Standard log daemons"
-HOMEPAGE="http://www.infodrom.org/projects/sysklogd/"
-SRC_URI="http://www.infodrom.org/projects/sysklogd/download/${P}.tar.gz
-	mirror://debian/pool/main/s/sysklogd/${PN}_${DEB_PV}.diff.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE="logrotate"
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND="dev-lang/perl
-	sys-apps/debianutils"
-
-src_prepare() {
-	epatch "${WORKDIR}"/${PN}_${DEB_PV}.diff
-
-	epatch "${FILESDIR}"/${PN}-1.5-debian-cron.patch
-	epatch "${FILESDIR}"/${PN}-1.5-build.patch
-
-	# CAEN/OWL security patches
-	epatch "${FILESDIR}"/${PN}-1.4.2-caen-owl-syslogd-bind.diff
-	epatch "${FILESDIR}"/${PN}-1.4.2-caen-owl-syslogd-drop-root.diff
-	epatch "${FILESDIR}"/${PN}-1.4.2-caen-owl-klogd-drop-root.diff
-
-	epatch "${FILESDIR}"/${PN}-1.5-syslog-func-collision.patch #342601
-}
-
-src_configure() {
-	append-lfs-flags
-	tc-export CC
-}
-
-src_install() {
-	dosbin syslogd klogd debian/syslog-facility debian/syslogd-listfiles
-	doman *.[1-9] debian/syslogd-listfiles.8
-	insinto /etc
-	doins debian/syslog.conf
-	if use logrotate ; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}"/sysklogd.logrotate sysklogd
-	else
-		exeinto /etc/cron.daily
-		newexe debian/cron.daily syslog
-		exeinto /etc/cron.weekly
-		newexe debian/cron.weekly syslog
-	fi
-	dodoc ANNOUNCE CHANGES NEWS README.1st README.linux
-	newinitd "${FILESDIR}"/sysklogd.rc7 sysklogd
-	newconfd "${FILESDIR}"/sysklogd.confd sysklogd
-}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 0144183d312b..ee8a44923d48 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/xarchiver/Manifest b/app-arch/xarchiver/Manifest
index 9c3831f4a8a1..32f1c7d43871 100644
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@@ -5,6 +5,6 @@ DIST xarchiver-0.5.4.11_p20170629.tar.gz 1052723 BLAKE2B c4f0b0ae634b6c11ea15d92
 DIST xarchiver-0.5.4.12.tar.gz 1074764 BLAKE2B 65d8968a470f7ea607fcbb1e2ff3b6c54ff8e521df1ca0cd29d3b7fc7b84d2ad5e2b9987bfb482979c7099d62287c463317d524cadc4a03d6b80ae61d28bfcc2 SHA512 18d177efed810576ee4dc4bc379817cbff390bcbfc541652d8288545bbb4a0e29b2136364e8675814a2780d06e2c5537ca4451a1c73a6becd45e1c0de7ba4554
 DIST xarchiver-0.5.4.tar.bz2 1003045 BLAKE2B 6f1303c1d1b09a60616977c04c771cac78a25c756fbac538401e22e4fe3a808f990848d83041d5c5ceb667e30b5bb1d694318f0d21953201047fefdfc9afeb2c SHA512 3b767c2601d94104e2fc72aa8d168afa5a154b5747a9b0518d1c348417e56e4c19d872a0029fb78decc897e0f3bc9573e17d0317b85f584e7275b0e519f5f30d
 EBUILD xarchiver-0.5.4.11_p20170629.ebuild 1420 BLAKE2B facfe37669671309ece170cbab8f29887bf84b4180aaec7e4cafe80c7a8e975a10430d7b573037bbb46e817cea9cea2314433684b43406736f9f7c63eb5c04dc SHA512 0030d3bce1e6dc695b90d15a97c7d66910d9e90bc9f0743e4b942eb3a59cf194ae6b82dd095255fc8eb2ec8b2b3c409f60aafbdf9ee2cb0c1b6b22b5e4a2267f
-EBUILD xarchiver-0.5.4.12.ebuild 1325 BLAKE2B 130b8f95a546498fe2d082f84c5d3e80e75fd9b27246d9caec47be594ab6fcd7aad726574337e8c65ca19fe4f6b81c7340bc8e85cfc753bafc8349dc97f2053c SHA512 7cdf956c002861e03e9a17ae9b4cd7218dfceb151831b694830d405831f9478bae095fbe3209986c5680202cebd6d9b1c55d345d725095812de6d5c5e65c5d63
+EBUILD xarchiver-0.5.4.12.ebuild 1324 BLAKE2B 4acb0aae2afd8170cd72ce23644daa8cb155cc60918ce86b569ab5a489f421f278d6e9505aabdd0dfc05fff82f3af08004120c285c522b28a2bd59492840b2e1 SHA512 5a9be3a0f23c0208dcd61957a2c608bbd9f58fe872864781589951c8a201686357ae6843389ffbefbefce65a4e9e93acd2dce66aecc5b5630f41f219c895c8e0
 EBUILD xarchiver-0.5.4.ebuild 1328 BLAKE2B 76286bbf89e4782fd113168a8bd6b6b02def8827ca86805e166c9d5a3d50032ad87d9e6d2529b29a06e4fa4c2ed25b3ae95373e2f99c8c36a98efedcd7398417 SHA512 ed25ddd86d9c9d048f8a6cb155fd79c0c45d380b91f587bd8364ac3d455fc0a75d9eed271b64f7b42d293c762c57747c52608a30f2a1899ee935b091c9a0258e
 MISC metadata.xml 447 BLAKE2B 3ac670facb7c0034e1f079622c8c14e04a131e359e1cdbbc18b7cdd111a673651a97a7e35a430d13d80c1cf35e87f4aec0738836b60dd2837e4a77ff4e9485a3 SHA512 ccccc741a75658963153a71810ea9d8c25bfe49765f90a4aa5558ef8fef2abdd1e17d1c9ffb604a78deafeda1e5032b671c8f85a8189e6c89cf3f057dfec9a4a
diff --git a/app-arch/xarchiver/xarchiver-0.5.4.12.ebuild b/app-arch/xarchiver/xarchiver-0.5.4.12.ebuild
index 2bc38e290d6c..800786fd793f 100644
--- a/app-arch/xarchiver/xarchiver-0.5.4.12.ebuild
+++ b/app-arch/xarchiver/xarchiver-0.5.4.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ib/xarchiver/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=">=dev-libs/glib-2:=
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index ad52d31b2986..f5d28bc913d8 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/b5i2iso/Manifest b/app-cdr/b5i2iso/Manifest
index 04b08b654005..b19c599d69c1 100644
--- a/app-cdr/b5i2iso/Manifest
+++ b/app-cdr/b5i2iso/Manifest
@@ -1,5 +1,4 @@
 AUX b5i2iso-0.2-segfault.patch 388 BLAKE2B 151e6f41afe5e241be181de2b0ce50a2ee0bff64ab1b04ff99501b2844705a1295cbfea28b85446d2aa899eb6e3a58b9f40e992c336965f8b07749e1698af53c SHA512 133fb1c4da9391e1465f0c820fea2038859c351dbf9b9a8de293294c66857a68f0f544bbca9b8a927a615cc3488a691db6a0bb532bea98362904876634966a5f
 DIST b5i2iso.tar.bz2 7503 BLAKE2B a1ac74596213845c49dd007390445640ebe6226ae6273f4e05d567c58badb2ca2698c06951be7348c63c89920dd8034e376343d387665ae08ee13747efcf903b SHA512 2ec6ce30225370898aee9876937b70ee38ed68b6515bef13eb010f1ef1970894995461d5dc5f44ac24d2e7e682774e4fc3c6d2bdde8f744129a3f6103b50f9e4
-EBUILD b5i2iso-0.2-r1.ebuild 583 BLAKE2B 2a7ec6762f578eb29d1bd364d50a972e28214ab90651ef9e578925dfb9fb5575360db84b59280ce0edc012af7722d51b996c0d97afdc740e8d3dd9455e747b21 SHA512 459c452c318d2112fd67e23e547b5d893f9fc09852da82aa61da16f296340cad155a4087505cc8b548c7788370fd312bfd73b6611582f7edcb5725acb58ba1af
-EBUILD b5i2iso-0.2.ebuild 479 BLAKE2B df5475bfb3ab90277f307ee82edc1a268dc91af650910b4585d2a7f32b43c3b3114dc61ae83bdfcb6be5cbbea8660cbc51e221f2d7d3216faaf781e3bd88aa24 SHA512 97d8b01c2a030cbc52b390ef2983efb15bf83f929ea1af3c39be4212312a664f9231e2a90868255f8fc9acbf533c6b5f16970219c480e74725a0566e55080f44
+EBUILD b5i2iso-0.2-r1.ebuild 581 BLAKE2B 88f162876dd3af073cd3af7c3a188cf998c3fd3ebac2e36880bd6379d9a6270ceea581d23c9f7bd30e9b83ed4fa62969a8ff408811becb12f0261684750e4496 SHA512 33048970e02ab8bd1d39a6a77be648e7e7e6bf20633b7ea10e5e274ab356dabac1b375a26442f699ca0324957b2dea62df7f013676e1f1470d6b9a12c4c5ca2a
 MISC metadata.xml 168 BLAKE2B 3e5971a4f8eec29fb98ca9e9e3e93e1ffb3ceecbc911e171844dee81b53f757ee37173d79fdeba5ceded1ae70f84cd00da36912efed91d3bbdfd09e339886166 SHA512 a0f46e63b4efc395be44cfec9bafd3f0067a239be0ac79de35b85c6ad14f6bb7dae7c4e82ce8d18fb4c089026426d6554ecbe2c54d4b0f8bdcd77cfee6467ec4
diff --git a/app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild b/app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild
index 4fa520247588..f45009e3c802 100644
--- a/app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild
+++ b/app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${PN}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 PATCHES=( "${FILESDIR}/${P}-segfault.patch" )
 
 S=${WORKDIR}/${PN}
diff --git a/app-cdr/b5i2iso/b5i2iso-0.2.ebuild b/app-cdr/b5i2iso/b5i2iso-0.2.ebuild
deleted file mode 100644
index 7790eb38d225..000000000000
--- a/app-cdr/b5i2iso/b5i2iso-0.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="BlindWrite image to ISO image file converter"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${PN}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	$(tc-getCC) ${LDFLAGS} ${CFLAGS} src/${PN}.c -o ${PN} || die
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-cdr/bchunk/Manifest b/app-cdr/bchunk/Manifest
index 880ea0110a6e..7f2c16e31b7c 100644
--- a/app-cdr/bchunk/Manifest
+++ b/app-cdr/bchunk/Manifest
@@ -1,6 +1,5 @@
 AUX CVE-2017-15953.patch 738 BLAKE2B a7d35373ff5fc7f105430c6480285fe567a2ecd4cf6979b0e950a0945e9cdbe78aeab9815b628af6e398d1a57ae94ebbd8ec829b01a43bc33baa434ef4863b41 SHA512 266dc695cbc53a58f99cef7bff8e399a018275dce05d50edb4465096c418fa4d77850c671b56a3656f942f0affd83110f341c91bb325d48b9d264b5370b99a51
 AUX CVE-2017-15955.patch 773 BLAKE2B ed4a57da8a73cdde213a5b6e7b454d067ac7b178d1919490657ca0a2ba095ca0b2ae05dfe929d4ee92fa6a2fc7861215cddb9f5d6727d460f6a44b18b9f38581 SHA512 060d6d637f5af2507d63edea4bdda30ae4d6fa5b8e96aaac6d9e41fe328d474bf6854fea101fd6de878ea3b5f2f3e2ccdd1b8e1182a55fe423f293b2024dc7f1
 DIST bchunk-1.2.0.tar.gz 15078 BLAKE2B 60d443380ffaa8dd1d025777c91c1374a931f16c8de2219a4ff453ee4d7c6eb235b2380ce1021911636d247a12640214dc40b29f9c9cf917ff4bc4594f189fc4 SHA512 0e1f9daa2dfeff58e2c65ac2767bff804811fa22f70a220747aa873cb01b77b4c6a809736483aa22fb3f2d2a88885469d10fb45af4626069e992a0763a5fcc2d
-EBUILD bchunk-1.2.0-r3.ebuild 502 BLAKE2B 6329085b7b5b1cd81e29e93850ea91ca860b6844c8c61e684a115400d1a1f4354b3baf89753c7a84361ded8f4aceefdfafe584e5cdb96870f89aaedd62441407 SHA512 8153d27a6bbffe3b0d4fb50da5b5c64c9a0187a9db6008516975fdd133d4550484d88ee54075146690a87a098e21f462e09426436f1e5f5c6695cb4b892b1f1e
 EBUILD bchunk-1.2.0-r4.ebuild 584 BLAKE2B e6cadb8e14ffb69db005f27c76dfaa7eb77db351b5293d084d948b52304cbd6e6f54a67d31fa24f2fac30e04130ce78f19eab37a03c426f289b858478addb65b SHA512 1eaf7fdb44aec8579926280b8fd9b5eb4f3841cd2ec6c89d6ad097709029b8d0108abcbd79b64a517a48e93f4244f8a6ddd6bc35bc5b3f2fc289eeb846be772b
 MISC metadata.xml 316 BLAKE2B f234f603d9fcf3c50f48602826b361707317ec2dd0ca1438224e6ec753e92bd0c024d773343c6b6413a920698f4673b85cf6b6411a0c53dc02253b5e341da236 SHA512 1a2c6992e5957694c18634dd12d5a567d1bd74b063f91e7c524984722955a0a72ff22ff2ef17932eb2eafd84d4493dbe6a103df3fad70e4134fa33ddcc3463e9
diff --git a/app-cdr/bchunk/bchunk-1.2.0-r3.ebuild b/app-cdr/bchunk/bchunk-1.2.0-r3.ebuild
deleted file mode 100644
index f8387e0cb352..000000000000
--- a/app-cdr/bchunk/bchunk-1.2.0-r3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Convert CD images from bin/cue to iso+wav/cdr"
-HOMEPAGE="http://he.fi/bchunk/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-
-DOCS=( "${P}.lsm" "${PN}.spec" README ChangeLog )
-
-src_install() {
-	dobin "${PN}"
-	doman "${PN}.1"
-	einstalldocs
-}
diff --git a/app-cdr/uif2iso/Manifest b/app-cdr/uif2iso/Manifest
index 9080cef94a49..718a1598acf1 100644
--- a/app-cdr/uif2iso/Manifest
+++ b/app-cdr/uif2iso/Manifest
@@ -1,7 +1,5 @@
-AUX 0.1.7-Makefile 184 BLAKE2B 29aa6274bfc615b17ca825da5e191e30ab6aaddf9eaea4c614a16d462c8f195197fbeae99424a10eee5af1eb092f506d34bb2392166c7a0ab39ede4da19c2b08 SHA512 a38e7164c753273604272f07d141d6dff57102b989e647f7d0c3682f8afa719af4c4717ab64f6a1ed5a33b5081f5ea71a291b2ca1baa265ad9a00b6c77650d54
 DIST uif2iso-0.1.7c.zip 113727 BLAKE2B ae82e898cf27da8e3283af4c3d8dc2bea87fe29fbe998cf720f7876665c621495b1f68ab28af1250d7d041640404fc3d04c112eb7599476dfe4cb8118ab1dad9 SHA512 22e2e2d156cae7f2f72ba5959bf3b4282609397d148e6a98666382003ce568e185a90e6af8821829d302c1efea1ca2c6d155df0181c6a29294d70de8adc9591f
 DIST uif2iso-test.iso 55296 BLAKE2B b17ea40509445665c9103b38fcf26fd8b6e84917e9a0d31c7a53bbb201c310685649c06d055454dc2883e1d566d98912003d74ffbb68f6e6dca8dd47c1705a59 SHA512 775f8fc87a51709c6ef10ae2751cc8600c22d70af419afd680a1917338a699e6a3934597af26400f67ff68fdea5db32e416d73fda370ef71f0d19a5bbdcbedd6
 DIST uif2iso-test.uif 499 BLAKE2B 8e5098629c11572e839bc481ef44e7ff79c46926e049c3f5fb41b1868f63775f509740679835b289222299cfc9710ae8ff7f1739089a44f6fabd1d12720251fb SHA512 6863305d325ec6cf6c8693512d011ec4150bcf0be94f84495e4075cea74412b9fd8ede17f77ad9f7d4b3cf205c9406adbd5440697c7857ab094e4659d074efeb
-EBUILD uif2iso-0.1.7c-r1.ebuild 1081 BLAKE2B 47a880b9f7d50227e432d36af99329c548df77c35192c17b95df9fc7bdc304d78b8af1fe32b40c3f11a2e72b1bd283378b1549bfa43ebe3653adaa9914457cd4 SHA512 8f3beb347f8a1b99c0d1b978163d96b87b6597a6b56caf72f4cd06e8efe8cacb8f6c102ae4d1fac3dcfde03d7b94d11d60e7155816bc4a96efa48dde21028605
-EBUILD uif2iso-0.1.7c.ebuild 697 BLAKE2B a61cf005963990492b0ed2d8e7c2a4c1e844a27c49a7277e51c4389a3d41d4e1527b9bfd71f964cd9bfebf334dbd9b8d749e97ceef351e9ce790207ccc483caf SHA512 e971f2cf73f4a65a19e47880ec0921389d2fbe2132a8d3ef0fbdb89a9d05ac51a908d2683260a5ae8fb58f29293393fe8bea392de1293ab4a019aef9e15c97c8
+EBUILD uif2iso-0.1.7c-r1.ebuild 1079 BLAKE2B 850274931d547bfd444f53a24f3566073f4980ef021a1b8dd4acb4b78480b1ef83dfae9d416bf6ba8f2d6e8eba8f6c230a72c35b1b7ce8aac7a54bee0db69fbf SHA512 8ef1cbb864c6554e1dd7452ba50fea697ff55dd7c4c43a50940757f265036ae7ef9b2f2486c5ca9cb5cc82596107c7231b580153f54836a039f8af07b28a32d7
 MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
diff --git a/app-cdr/uif2iso/files/0.1.7-Makefile b/app-cdr/uif2iso/files/0.1.7-Makefile
deleted file mode 100644
index 0b8a2bd95355..000000000000
--- a/app-cdr/uif2iso/files/0.1.7-Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# We replace the makefile since the upstream one is not suitable for
-# us :(
-
-OBJS := $(patsubst %.c,%.o,$(wildcard *.c))
-
-CFLAGS += -DMAGICISO_IS_SHIT
-
-LDLIBS = -lz
-
-uif2iso: $(OBJS)
diff --git a/app-cdr/uif2iso/uif2iso-0.1.7c-r1.ebuild b/app-cdr/uif2iso/uif2iso-0.1.7c-r1.ebuild
index 97d523632af7..42e0d67928b1 100644
--- a/app-cdr/uif2iso/uif2iso-0.1.7c-r1.ebuild
+++ b/app-cdr/uif2iso/uif2iso-0.1.7c-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.zip
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 
 RDEPEND="sys-libs/zlib"
diff --git a/app-cdr/uif2iso/uif2iso-0.1.7c.ebuild b/app-cdr/uif2iso/uif2iso-0.1.7c.ebuild
deleted file mode 100644
index 9d43caee44c3..000000000000
--- a/app-cdr/uif2iso/uif2iso-0.1.7c.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Converts MagicISO CD-images to iso"
-HOMEPAGE="http://aluigi.org/mytoolz.htm#uif2iso"
-SRC_URI="mirror://gentoo/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/src"
-
-src_compile() {
-	# Yes we use our own makefile, I'll try to explain this to
-	# upstream _again_.
-	emake CC="$(tc-getCC)" -f "${FILESDIR}/0.1.7-Makefile" || die "emake failed"
-}
-
-src_install() {
-	dobin ${PN} || die "failed to install"
-
-	dodoc "${WORKDIR}"/${PN}.txt "${WORKDIR}"/README
-}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 3c78f18c17ad..40f17893a78e 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 9f090e13dc91..b95fbbd56c46 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -3,7 +3,7 @@ AUX gpgme-1.8.0-cmake.patch 1216 BLAKE2B 40510d7d2b700a58f12436ae81c2b978dcff450
 AUX gpgme-1.8.0-gcc-7.patch 554 BLAKE2B b31ffa5f08203dd0b896c04b47b0cb0d4916c7170c87e5ab8bf45896058817668660a0ee1648f2111a3d8c73bf896df015b4b371c95a1caccc7450dfe0792017 SHA512 3256a04a7dfeb7b3b5a20765b6350454069f2a96d79c786326868513a8b87f5337084a0e2a5afeab0485257b4b360ba2fc9f56f08bbc0c102d75773ba83c44f7
 DIST gpgme-1.10.0.tar.bz2 1370162 BLAKE2B b421d91a4fcd2e8887dc1a5c276fe1cce66f379741d86dfca751f4863039c39ccaf492c7683d6f6a0de407d2a6056e3496e45e3d472eef36a879e8b903e58c57 SHA512 8ffa348ef4775ed3209486444d54411e28c9a0ff1d7a4315feb0b2856ccd5d110b219100ea41262ca0016af69a1936d79fee0eadf2599c7c5bbeed05d11f7ab5
 DIST gpgme-1.8.0.tar.bz2 1298407 BLAKE2B b510651d0df12091489bccf6a432420db63337cfe5149d0449cef9071cbb671a52f7837d900b4d2e40deaa47688b1ea19a025ce8c930027a14620410228bff52 SHA512 9f214a44ddc4d602c2a0befc66aa6be9f2c90a24e153b873475867e30eec30e074826b98c11d20b0a2e4cd04e2625ce2545220481225fceb6ca9c51d3208e3de
-EBUILD gpgme-1.10.0.ebuild 2720 BLAKE2B 2e6e6c70d56c0d03a0486f081d36c1bacf0de8735180aa0590650e9e6088298b66428d0d94a968452e430e3de0a8f2ad3b45e0b2e296ab5a633b4f7723a681b3 SHA512 f57059a86c2c110e27f1164251dc65a267c2f38fda8dd8041456460f1469cdd5c8d6b46a930dc2d38ee40c662c47f732df258b903b952599ee29196d1291aa1b
+EBUILD gpgme-1.10.0.ebuild 2718 BLAKE2B ce6e2336bee1ef7d6cf81dd06ca922652824db497e6b232717fe19511edb495a9543b10b02832b64799c7df1999d60b954eefa9c0a7a192c60da7e4b2582323f SHA512 285cff6efb2f233b50e4d2a674e89cd7a111f2550219180f3cac26925e62b50b2028c1fac91df1cf9f656e9b646caf6bc7615c2e026ed3a7275d69e0fca63d70
 EBUILD gpgme-1.8.0-r2.ebuild 2530 BLAKE2B f51880eb8800e66df6954ccb73e2e330f69ea553c52d187bacb00921306c8250204d14dbe748612cdd4958ca5728e1f80914eedd42367bf70225ec173ec32c18 SHA512 d1f5f1aad5bb8de38ff049084d81443c82fe88ddd720a5770e89fadb00d06094493d1911d033ebcd6ae8cbf1117e9b921465d0730b2a17730420895dd60c9244
 EBUILD gpgme-1.8.0-r3.ebuild 2682 BLAKE2B f04e23cf0773a36e380ad71e4603ec2b26583eddf25670946d4d05f134c18da8ae830cf0228417853ea97e4472e7284a87c3ac50099156de3b569961baa6827f SHA512 b6beaec93a62270d5e87b5f3798655ce3c48b3da65947904ec7667963ba39d28d9e032eb72477ff88ec68922c677b1b921daf2bed1de09c9f48e0c788fd394cb
 EBUILD gpgme-9999.ebuild 2238 BLAKE2B afef415c3a730fc5ec3da76963a9c6a02adc2c49fd6629a49589fbc51513a288edafcb5d730f862c6147ca287d489b26190e4edbc4dbc3e29ad3c74dc7538a96 SHA512 a7c211d5b9cdddcb3d67e364e069f2d256aca238d7d1262af948859a3db50f0a300868113c721bf2796e696c5559a7089fbfc00e6096b5fc2686dac69c296e49
diff --git a/app-crypt/gpgme/gpgme-1.10.0.ebuild b/app-crypt/gpgme/gpgme-1.10.0.ebuild
index 81ca9ecddb2f..110e0e94550b 100644
--- a/app-crypt/gpgme/gpgme-1.10.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.10.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp static-libs cxx python qt5"
 
 COMMON_DEPEND=">=app-crypt/gnupg-2
diff --git a/app-crypt/tinyca/Manifest b/app-crypt/tinyca/Manifest
index b61134d0d62e..899c0bedb4d0 100644
--- a/app-crypt/tinyca/Manifest
+++ b/app-crypt/tinyca/Manifest
@@ -2,5 +2,5 @@ AUX tinyca-2.0.7.3-compositefix.patch 317 BLAKE2B 821c7758eaf7058b3f5bea17796fe9
 AUX tinyca-2.0.7.5-openssl-1.patch 1468 BLAKE2B 338c4666f5d3b231b449c3118b1f0eb14b8d469c505cc7818abc3f12b4a76f8f8aa23c0aa1391e2fedc1a26300be46d429ccde334d5043cef6bd7f5536ca88d1 SHA512 5c5487eef82d30cf2cffc75d1fbd331a7c490dc30befa91ee753f4dd82bb8492089d162c3f15c20722df00adedf7db0bd30cf2b83363922a9402d66fc1abe8c4
 AUX tinyca-2.0.7.5-perl-5.18.patch 1738 BLAKE2B 7b5af07210a41573845ab97f5337c46110c5422f2065eea81d41a35eefda467c30cfa3ddd42c944fe1db64f392e7c72a828b853c216e4c9ce93143df37eedb45 SHA512 528a34b9ca9ace403949b6d347f91a4a33d94e92f867ea476adbaef745439706014c478be36ac6dd45d15f56f0ba2e1314c633d68285ca7879fa25dd0d3cee33
 DIST tinyca2-0.7.5.tar.bz2 172779 BLAKE2B f6a4b1d9d2a22416ff8bbec9fa0fa3aa7f6cae4ff0b32dd9ab9063760b47d91c931d13c73268c2f627411e5e02ec99231ea847ecf30a963a027552bb3990b38b SHA512 47df0b995715ad973b12da7d2999ae90f8887549437235b287e1d294331adc8d527bf4435ce1c30df278db8e5f8fc7df29a35d3650d41bfd4d0a0a7c193994aa
-EBUILD tinyca-2.0.7.5-r3.ebuild 1534 BLAKE2B b5efa95db2ea2c2eae6f5e66d7f365d45f7870cd7a2d06103e75f18d558cfdcfa98980ad89cf21c37744500f4b95415ccb772543519a36c7cfd2c05be8ffd20a SHA512 1aedaf75b97cd2931b579babec9ac73cf14ef19efa47fe0f268bb17abe8587599af5b892e4ef7a113128f703380c802561a5319456a45be548ecdc236f4a845b
+EBUILD tinyca-2.0.7.5-r3.ebuild 1486 BLAKE2B 8412f05f6e35893a5ac881651a0ed738abd52799e36f1fdcf974fee2961df4c56bf342acacc704e62df901c537918f04f0cf328579cc7c63dfaf0c305678d32e SHA512 6736299b1c124d0cf8e0af68a771d19bd0a382a09a12c70718f77b2e8a354d2e179573a79de87a1c670e333533ed49c3c873bd79f04b6394f3c76f12aa56d582
 MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
diff --git a/app-crypt/tinyca/tinyca-2.0.7.5-r3.ebuild b/app-crypt/tinyca/tinyca-2.0.7.5-r3.ebuild
index ebe613387710..274da28fc848 100644
--- a/app-crypt/tinyca/tinyca-2.0.7.5-r3.ebuild
+++ b/app-crypt/tinyca/tinyca-2.0.7.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,10 +16,6 @@ KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="libressl"
 LANGS="en de cs es sv"
 
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
 RDEPEND="
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
@@ -67,7 +63,7 @@ src_install() {
 	local l
 	for l in ${LANGS}; do
 		if [ "$l" != "en" ]; then
-			use linguas_$l && locale_install $l
+			has ${l} ${LINGUAS-${l}} && locale_install $l
 		fi
 	done
 }
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index fb7f1360d987..e010e6f4b1f1 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index e0b83ebe2a7c..ded6e9ead4b1 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -9,7 +9,7 @@ DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7
 DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9
 EBUILD gvim-8.0.0386.ebuild 11569 BLAKE2B 2e9803cd0cad4f6d9ba86f7a4f9242a1850c4017a1b7cc894ab57d9c450f173d9f24f7deb2a2f7c26a4598bfb79d2bfecfc29c777473e0759c6e89fcd99cb5d6 SHA512 93d54860172f0e8caf22d129d55a26276e4ba0d68f91c74dcc969fb2f738f3197ee77de983d65c9533029a04e0cd74fbefabf6802ecba6bb0d4ba0807b68783c
 EBUILD gvim-8.0.1188.ebuild 10477 BLAKE2B 764132ab93aa42aeef1f26fdfaf1095630ddcbdf148681d2ff929611a6fc736ab7c325947d39752dbe112c869cdf1ff51fb0419c9316f9e05eb0440a662cc38f SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf
-EBUILD gvim-8.0.1298.ebuild 10472 BLAKE2B 06445daf6e99a9acf9ffdc9e4f7de0cfcfeb0c14b327cf48f57d13301e0ba98987713fd8edea9c6f973cdabe73d5f17d55ca13b87feee7b2289043ebbc0acb6f SHA512 dc6700fbf59921d13b24787023493c1c0617ca783e3d961235bfa43b0e7aca13779502796dd1621b14e9b87330a62e944b1cb5960a8c682ec221cf1ae422b65f
+EBUILD gvim-8.0.1298.ebuild 10471 BLAKE2B 2e3dbabe5f486349e5e0faf18080f35b495df382f3c47b21f6f02d7934fd5d335d21717f7c77d2880ca4ea6f4c8f5fc05cbfdfa45996850d13f62dd4f260863f SHA512 ba4598cf1dda69db0b84ce8014a07c646f5b8a8e6c770f7d279d888ee65ebd0af5f95a7277054600b68bd3fbe287d33af39a0611d25e827f5d877c59fc028dfd
 EBUILD gvim-8.0.1428.ebuild 10477 BLAKE2B 764132ab93aa42aeef1f26fdfaf1095630ddcbdf148681d2ff929611a6fc736ab7c325947d39752dbe112c869cdf1ff51fb0419c9316f9e05eb0440a662cc38f SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf
 EBUILD gvim-9999.ebuild 10477 BLAKE2B 764132ab93aa42aeef1f26fdfaf1095630ddcbdf148681d2ff929611a6fc736ab7c325947d39752dbe112c869cdf1ff51fb0419c9316f9e05eb0440a662cc38f SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf
 MISC metadata.xml 675 BLAKE2B 4c96806a5744b61f168512c28512c9c6114ca42522ff8ed266cb14c5e16ef538e4de8aa15ce233cf1044f98dabf27c6654592eb296e4a83175940f88ddd4b1a3 SHA512 df75c9e935ae47b8961c8b6b984483b8032e39d3833ffcf4784e2630cea870579d45ef5f104b71d6b35f4128ef689394edd72510fce82a76e596749ce69d835d
diff --git a/app-editors/gvim/gvim-8.0.1298.ebuild b/app-editors/gvim/gvim-8.0.1298.ebuild
index 5441635ae1df..1f8cba24c707 100644
--- a/app-editors/gvim/gvim-8.0.1298.ebuild
+++ b/app-editors/gvim/gvim-8.0.1298.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 fi
 
 DESCRIPTION="GUI version of the Vim text editor"
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 46de1edbfd0b..567cfb72d277 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -4,7 +4,7 @@ DIST nano-2.8.7.tar.gz 2822417 BLAKE2B 2559497b9aee4d4c3cfc86e8af6a54bc0af58588c
 DIST nano-2.9.1.tar.gz 2839465 BLAKE2B e0d443dc3c86446478edad73042c6b4698a86fdfe3727deac858fa99d52bf319e2b3a120ba57bf79f3b78d9d3d7e8f4b5bdee234f6450882fee06647be371191 SHA512 7eeefd4cb5f02f1ac14ca10c536f873a1a85f3a5ccc5d5c40a12770b26dd0d5b0bbb3a0770b394779c8234891d7226e0d06d72465d7687c971bc62606100d0b6
 DIST nano-2.9.2.tar.gz 2839256 BLAKE2B 6e27ad0ff72a17461d614f2222ef33bf2abaaa0f4576a8e378524b090c702adafa86e78d976cf5b5dcd2ca1da802aeeff9b3f4bc5e81fa31b8164ef2979708d6 SHA512 b45afb593a04029a137f49551242f2dae901482878cca4aac6cba1c0c8af38a83994daadbd025e90f019cfa9d1273784de4491bbadf47104914904af804661d1
 EBUILD nano-2.7.5.ebuild 2281 BLAKE2B ad2c9f6a6b66c74e309022de21f0e233af8e0f091d7be79843753b244509c98e5c7115b3dfcd42566d2d3da46c1856a72dfc8da96399ad5eedd3a3d73395ecce SHA512 65c76d2744ad7bfc0fca1b0c9dcab041777a542c921f0526de18251b64bf32d12fe71fb8fd050eea4da074b56c12f0086036065e7ecdda4dd5b66b06382d81a0
-EBUILD nano-2.8.7.ebuild 2328 BLAKE2B 38d3f9c65355744e83f4f04417e51564f4c7a8c026818a794703b87f9116c1a934ecfd7ff17a004775321df22fd5cd7eb73c08d590ed806d737213cd5e1373e9 SHA512 962d7c08ae1a09b18d8daf892525b1a3e093f161bb12c8f4ae888005640e5a43995e93fd8d830f0771f4cc791fbae1073406f415595215aa94016087d26335e2
+EBUILD nano-2.8.7.ebuild 2325 BLAKE2B 3a142894a06ed990afabae1858f409e077e441019cfc09233f21b724f22632190440db393178ab8eb776aa36556a15c152bd4f5bdfae142f2052d6589fba0b8d SHA512 7cd68aca6245bfe33b4de8287c82096d523bff7f5fc31b8846c6e9d2fe768520556dd44de5e27a94be702b3f8b4ebacc04aee25fa7badddfe5338b076fbbe0eb
 EBUILD nano-2.9.1.ebuild 2265 BLAKE2B c47ba305fd6dd42749764ea90bfc9f5b5482b7a5eadea6c179e01f082657398bf89d586f17f0e3eec23df78f6d4d76038017314905acb06cda870b4b80dbd471 SHA512 0bd91b9afea8c8f6592e84047870098c9948687d516fabf8e18be5fa8a2690db0b76f96fd45aba59743dae4cb6630fe2b76825628f0b954550ff95de3feedcb4
 EBUILD nano-2.9.2.ebuild 2265 BLAKE2B ae9bada0b50e6cce6d136e56cdaed2e40b2b86564a5f6367587f19690641cda8431d6399c5ed959c16acbf859edcdae51eed961cb57729644bf39514271dc71f SHA512 05be72b2e1dc44db6211f154165dd6268fe51bde7468ad3f2c2628bbdc161fef47e90672f43a0200048134711fcb415e6da3386dfc601b8ea052c33277cf8cf3
 EBUILD nano-9999.ebuild 2265 BLAKE2B 678ff8f900f19d4879d857dc2f06a99edd0db894cef8d78abce94fce25684930cce93c0e9822d693415b5c5a5ca87217c4f6ff7b0da7ee4f65312eca5c9a6cdb SHA512 9d4902c001632ba5139d4dc14ad8faba1f1bd133c85092682376ec8835c5b491fdc2cdb1abda2aca311fbc57e72b93ab6f38923e067c744e02c6ee6795357d9e
diff --git a/app-editors/nano/nano-2.8.7.ebuild b/app-editors/nano/nano-2.8.7.ebuild
index 5e7efe2e7c87..debedfbeccc3 100644
--- a/app-editors/nano/nano-2.8.7.ebuild
+++ b/app-editors/nano/nano-2.8.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_}
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 097fca784394..a3105f6d4f00 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,9 +1,7 @@
 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
 DIST neovim-0.2.0.tar.gz 7846467 BLAKE2B ee929122b3855ccab6247a0e8ab975b09d77e1034229ea324ed82ad705cacbd39f55d2fa96eea3f3677c7efe64c69ebecedd5fde09e508a6fd23acb6a1f5b489 SHA512 fc4be03c5bee1c9928376938679f9a900f3ee2e58df817d1cb9b5af51350dccca63a7638114b0326ec4565a047faaa4b50fecfc932c1d59ee92efa54625e22cd
 DIST neovim-0.2.2.tar.gz 8325879 BLAKE2B dbf43c5927b8c8719adae9a3f73c57429de47f1b7c7489a118b7467df2f0d32cd02df8e10889727b4dd77fe8b4fb4f95520c678d6775d5d908705770a47cec0c SHA512 5609defe86ac98356f1b9ae9adc6049bb4df920a9a2ae3104f761d52d4dd54cbc84d2596231595dd9b0aa97201fef2121e6c5c86a19267ab6b871dbf4b568209
-EBUILD neovim-0.2.0-r1.ebuild 1847 BLAKE2B 1a6b247bf75651cf568ba20813060bc5ee0d311fe69baaa22c3de7d5563048530bb3206843863b7b0fe9c17ed027b00edaf53e19af3c2f75308d68df9af1149a SHA512 f7eda7eff045f341cc97af5061f50996b735b294178c58ec68851795b03e2246a8b36823c5245f79ba178e04084c081088cb8b70a5babcb018c77ace922c3476
-EBUILD neovim-0.2.0.ebuild 1802 BLAKE2B b28c67e67b6fb793e1d589d844b3b04117974036d908a96aed3b7ab0e8893f66d742af71d235907989114b9df0b8d98cee52d8a6b4ee98214a78abba2837dca2 SHA512 719e37a3304fc08980a37021b49667dd5a53a4963c479e1f60136d88455ae6c2df7ab669f2354a8d974bc49dd218c116377cc8c5128a1b29473d9735de7c6946
-EBUILD neovim-0.2.2-r1.ebuild 1847 BLAKE2B 1a6b247bf75651cf568ba20813060bc5ee0d311fe69baaa22c3de7d5563048530bb3206843863b7b0fe9c17ed027b00edaf53e19af3c2f75308d68df9af1149a SHA512 f7eda7eff045f341cc97af5061f50996b735b294178c58ec68851795b03e2246a8b36823c5245f79ba178e04084c081088cb8b70a5babcb018c77ace922c3476
-EBUILD neovim-0.2.2.ebuild 1802 BLAKE2B b28c67e67b6fb793e1d589d844b3b04117974036d908a96aed3b7ab0e8893f66d742af71d235907989114b9df0b8d98cee52d8a6b4ee98214a78abba2837dca2 SHA512 719e37a3304fc08980a37021b49667dd5a53a4963c479e1f60136d88455ae6c2df7ab669f2354a8d974bc49dd218c116377cc8c5128a1b29473d9735de7c6946
-EBUILD neovim-9999.ebuild 1847 BLAKE2B 1a6b247bf75651cf568ba20813060bc5ee0d311fe69baaa22c3de7d5563048530bb3206843863b7b0fe9c17ed027b00edaf53e19af3c2f75308d68df9af1149a SHA512 f7eda7eff045f341cc97af5061f50996b735b294178c58ec68851795b03e2246a8b36823c5245f79ba178e04084c081088cb8b70a5babcb018c77ace922c3476
+EBUILD neovim-0.2.0-r1.ebuild 1839 BLAKE2B bdc11a064f4dacdce4996acd949268afe389f8363a353d898fb26cd12215d700aa2df38cb2c58fa800783c9a9df0df90f233b6215d109dd193ec964a07816716 SHA512 f7f41e260069f113a7f993f5afce2d8d850574bad5ee24d67c1b0858caf4d8cf0b9a7d1d23ef753b2527bf8f3d0ad0ae702aa2b859784b301f7429b9fa7076a1
+EBUILD neovim-0.2.2-r1.ebuild 1839 BLAKE2B bdc11a064f4dacdce4996acd949268afe389f8363a353d898fb26cd12215d700aa2df38cb2c58fa800783c9a9df0df90f233b6215d109dd193ec964a07816716 SHA512 f7f41e260069f113a7f993f5afce2d8d850574bad5ee24d67c1b0858caf4d8cf0b9a7d1d23ef753b2527bf8f3d0ad0ae702aa2b859784b301f7429b9fa7076a1
+EBUILD neovim-9999.ebuild 1839 BLAKE2B bdc11a064f4dacdce4996acd949268afe389f8363a353d898fb26cd12215d700aa2df38cb2c58fa800783c9a9df0df90f233b6215d109dd193ec964a07816716 SHA512 f7f41e260069f113a7f993f5afce2d8d850574bad5ee24d67c1b0858caf4d8cf0b9a7d1d23ef753b2527bf8f3d0ad0ae702aa2b859784b301f7429b9fa7076a1
 MISC metadata.xml 823 BLAKE2B 6aac695d8e1ceef11309dca9d529808f890b67665688450e683f1a980f09909d2e4c2ea165a2aeac623f6224bc00b7e67d9e67c27a623a13595710e60e7e49bf SHA512 b87aa5497b7c5e9b61647cfd3413e7c6d232698952b778d4ed3a39d4c2a39e6947a5b7e19ef803f4172dda0d2465651f19a127d4aa5b37004224e5c3ec86a94d
diff --git a/app-editors/neovim/neovim-0.2.0-r1.ebuild b/app-editors/neovim/neovim-0.2.0-r1.ebuild
index 9694b6c32c21..13a7786ff184 100644
--- a/app-editors/neovim/neovim-0.2.0-r1.ebuild
+++ b/app-editors/neovim/neovim-0.2.0-r1.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 	remote? ( dev-python/neovim-remote )
 	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
 
-CMAKE_BUILD_TYPE=RelWithDebInfo
+CMAKE_BUILD_TYPE=Release
 
 src_prepare() {
 	# use our system vim dir
@@ -64,7 +64,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DFEAT_TUI=$(usex tui)
 		-DENABLE_JEMALLOC=$(usex jemalloc)
-		)
+	)
 	cmake-utils_src_configure
 }
 
diff --git a/app-editors/neovim/neovim-0.2.0.ebuild b/app-editors/neovim/neovim-0.2.0.ebuild
deleted file mode 100644
index 374bd28354fd..000000000000
--- a/app-editors/neovim/neovim-0.2.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://neovim.io"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+clipboard +luajit +nvimpager python ruby +tui +jemalloc"
-
-CDEPEND=">=dev-libs/libuv-1.2.0
-	>=dev-libs/msgpack-1.0.0
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? (
-		dev-lang/lua:=
-		dev-lua/LuaBitOp
-	)
-	tui? (
-		>=dev-libs/libtermkey-0.19
-		>=dev-libs/unibilium-1.1.1
-	)
-	dev-libs/libvterm
-	dev-lua/lpeg[luajit=]
-	dev-lua/mpack[luajit=]
-	jemalloc? ( dev-libs/jemalloc )"
-
-DEPEND="
-	${CDEPEND}
-	dev-util/gperf
-	virtual/libiconv
-	virtual/libintl"
-
-RDEPEND="
-	${CDEPEND}
-	python? ( dev-python/neovim-python-client )
-	ruby? ( dev-ruby/neovim-ruby-client )
-	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	# use our system vim dir
-	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
-		-i src/nvim/globals.h || die
-
-	# add eclass to bash filetypes
-	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DFEAT_TUI=$(usex tui)
-		-DENABLE_JEMALLOC=$(usex jemalloc)
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
diff --git a/app-editors/neovim/neovim-0.2.2-r1.ebuild b/app-editors/neovim/neovim-0.2.2-r1.ebuild
index 9694b6c32c21..13a7786ff184 100644
--- a/app-editors/neovim/neovim-0.2.2-r1.ebuild
+++ b/app-editors/neovim/neovim-0.2.2-r1.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 	remote? ( dev-python/neovim-remote )
 	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
 
-CMAKE_BUILD_TYPE=RelWithDebInfo
+CMAKE_BUILD_TYPE=Release
 
 src_prepare() {
 	# use our system vim dir
@@ -64,7 +64,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DFEAT_TUI=$(usex tui)
 		-DENABLE_JEMALLOC=$(usex jemalloc)
-		)
+	)
 	cmake-utils_src_configure
 }
 
diff --git a/app-editors/neovim/neovim-0.2.2.ebuild b/app-editors/neovim/neovim-0.2.2.ebuild
deleted file mode 100644
index 374bd28354fd..000000000000
--- a/app-editors/neovim/neovim-0.2.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://neovim.io"
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+clipboard +luajit +nvimpager python ruby +tui +jemalloc"
-
-CDEPEND=">=dev-libs/libuv-1.2.0
-	>=dev-libs/msgpack-1.0.0
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? (
-		dev-lang/lua:=
-		dev-lua/LuaBitOp
-	)
-	tui? (
-		>=dev-libs/libtermkey-0.19
-		>=dev-libs/unibilium-1.1.1
-	)
-	dev-libs/libvterm
-	dev-lua/lpeg[luajit=]
-	dev-lua/mpack[luajit=]
-	jemalloc? ( dev-libs/jemalloc )"
-
-DEPEND="
-	${CDEPEND}
-	dev-util/gperf
-	virtual/libiconv
-	virtual/libintl"
-
-RDEPEND="
-	${CDEPEND}
-	python? ( dev-python/neovim-python-client )
-	ruby? ( dev-ruby/neovim-ruby-client )
-	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	# use our system vim dir
-	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
-		-i src/nvim/globals.h || die
-
-	# add eclass to bash filetypes
-	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DFEAT_TUI=$(usex tui)
-		-DENABLE_JEMALLOC=$(usex jemalloc)
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index 9694b6c32c21..13a7786ff184 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 	remote? ( dev-python/neovim-remote )
 	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
 
-CMAKE_BUILD_TYPE=RelWithDebInfo
+CMAKE_BUILD_TYPE=Release
 
 src_prepare() {
 	# use our system vim dir
@@ -64,7 +64,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DFEAT_TUI=$(usex tui)
 		-DENABLE_JEMALLOC=$(usex jemalloc)
-		)
+	)
 	cmake-utils_src_configure
 }
 
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index d2ba83382673..18e2fb68cae8 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/playonlinux/Manifest b/app-emulation/playonlinux/Manifest
index 716c7181ec8e..c5559b971fc2 100644
--- a/app-emulation/playonlinux/Manifest
+++ b/app-emulation/playonlinux/Manifest
@@ -4,5 +4,5 @@ AUX playonlinux-4.2.6-stop-update-warning.patch 766 BLAKE2B 934a8600742d7030d22f
 AUX playonlinux-pkg.1 643 BLAKE2B 80c5381aad102d81eebaa81d3ed83ed0fb16aa29b7f4a2e2b9dd349fe020112fd34e32ac9edab510852cb66bc402d9ef46ed0a2aed5c3369885161797e47aca8 SHA512 115f87cee7c6d56dbc54da9b120ca468fb29ae4be116101cfa3e8efd1efd9a372e6e8424462087807f6755d496575c44788914f4e45c901359ce52fbe37210a8
 AUX playonlinux.1 886 BLAKE2B 903f21600540798a765ae209832c4f111380340f4c6305ca333b29e6508579e13b3df8c3d44bc56284cdce290b319d40294eaee7476630190c9b7fd24ece2e76 SHA512 44ba1a04a7e8dbf3d85d81bbcf92917b6fe7bd68478bbcfecfe0c30619b834cc6c973fc6dd7d637d7debc7ede2a206248feaca1a017834ba95f076fd16679c2d
 DIST PlayOnLinux_4.2.12.tar.gz 3204230 BLAKE2B 80ef0e5763448da4a37263c64d408e8263771694666a7c704b5900dfe0e52cc18405c34d609d8c49a0d05a383fca2d035e956e3bbe9a9a0c92a4e43b319ed7ba SHA512 f4ededc8fe0117c66fd5672e136e19b9b48a41acdd3e1b1b3dd7fae2c354e77795f0a4f8286b09b7d1813363aee50fa0811c04c3194aaf745963a2e6115b3909
-EBUILD playonlinux-4.2.12.ebuild 2857 BLAKE2B 01c447ec1c7fda53d3224e551929d7f1130242a0c61755ac547a59b978e35021a3f306d4e89c714691ef75f285d9b14555612c6b7ca97e3b1a5e582226fbc0ca SHA512 8958890afd86abafde4f11c383c434873f805b3a92d4af2e58598273c8e7abcf816afe08da21fb612330d27484de5244119a3cf79ff035a66763cf7cfa3f8e1a
+EBUILD playonlinux-4.2.12.ebuild 2831 BLAKE2B 5726b4c84d423b8d2ea519fccfa29ed8bf26dab8e101ae94f33e83d5b49f57fa5056a9feaae41555d90d064620e0ddef4d268f29164e2332762318e6693e1eaa SHA512 7c851c95913c074a4b5ee35d6bdf7c93f8795ee6e42c25a0b4c6dc49c94977d2b041568789e85f3e7392e4a510fc6b2d13002021ae1b075380b4f9585e55b845
 MISC metadata.xml 433 BLAKE2B 6ba322414d75d581231afedbb791ce71aff799da09be4e08aab6f4e7e2e88d19b6e8701e36599bd1760e7076558c733edfe19f603f7f9541d0197cf4f1d59e4a SHA512 1e1dbfa93723297b63288436eaa1ce87183de71847c0ce61767381f668f6ad0bf69119570f7c7e395866f15e176f7412378c09386f8ddb271f7b2ec39da2d295
diff --git a/app-emulation/playonlinux/playonlinux-4.2.12.ebuild b/app-emulation/playonlinux/playonlinux-4.2.12.ebuild
index 2ab1ec1009fd..c9cad5a9d855 100644
--- a/app-emulation/playonlinux/playonlinux-4.2.12.ebuild
+++ b/app-emulation/playonlinux/playonlinux-4.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -24,7 +24,7 @@ RDEPEND="${PYTHON_DEPS}
 	app-arch/p7zip
 	app-arch/unzip
 	app-crypt/gnupg
-	|| ( virtual/wine app-emulation/wine )
+	virtual/wine
 	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
 	net-misc/wget
 	x11-apps/mesa-progs
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 5172cf80a443..ad88efa4f1f0 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/emelfm2/Manifest b/app-misc/emelfm2/Manifest
index ce78766c2d87..55591b3f6b98 100644
--- a/app-misc/emelfm2/Manifest
+++ b/app-misc/emelfm2/Manifest
@@ -1,4 +1,4 @@
 DIST emelfm2-0.9.1.tar.bz2 1217126 BLAKE2B 994fb55f9aed452cf0b01b7a26d0b94b8a02dace54eb34f764fe6d9a8c6ea3820d4fce3242daa452e972fd6e630d564ee3781af6480c3a812d4f4bbc66caae68 SHA512 bd3a1ad2338c80d6824a2a84736470ecfa7e93f455cc8e3243944833807fe9b3544e2fea6bd6ccbddaf0188ad89ce616ed146271f6ffabec80f5dfb2f1ad6f57
-EBUILD emelfm2-0.9.1-r1.ebuild 1971 BLAKE2B 249c27700a6582a2adfd701dae967d0dc107dd90041b4a6e5f007ff0401443fbc5719b0ee4215e6bf5939737f8cc4e83116f34335ecd81b38abbf1713bdf948b SHA512 fd716b9b814d9630b8c44fc8b7603d44ebc7ee48f9b0dc22e848353e2a1a26ca39490dffe8da27b1b091cdf1fb7761d135b40e3f3946a83985a294756639769c
-EBUILD emelfm2-0.9.1-r2.ebuild 2019 BLAKE2B c685dadb147b91dcb0d2c80d716a1b55b37cc4aaf79988f67dd50ea56305679749445361b7ea741bdd28f67a7597bcf4d730e2eb6cc49527ad8bc798d92cbf95 SHA512 89c900f5e5b9f29a3fdabae42d37e1616c76bc11779a101f4601feb3146e8b08cdac3df1d9d7c386d64d1bd61d31a6fea495f9e3b909ed77f95b5f948fef956f
+EBUILD emelfm2-0.9.1-r1.ebuild 1942 BLAKE2B 8b7e2f917fec31da7a02187a6f5ac7e38613b3280a78d1520c707ec9625d08902137ef67e7959c653e8e6f62a8902bf5359491ca2b8e35fa9358ff8b2b0aaf92 SHA512 e44054f8eae6ac29421f737c59179a450ba3ee65e8c30bceecd447be0cfa73681c1c639430d1b21255926ee3133647b6a0dc1275cac465c01fd2f5c237812b58
+EBUILD emelfm2-0.9.1-r2.ebuild 1990 BLAKE2B 175e0b1df279dbb82f8db8a93d24417196adc1c27cfe16a76c551ffd2f13d28964e3889ef3f19cafc98e71e9b94a9b4814fd52ae5ea0ab87696ccb08b5f24771 SHA512 bea46f2f46b9121f067165625f812fa2160b569466cfd91e1a40b01717846f53e7fa8a72b0687c329b8cd4ffec8ab31009e727e05bf5193c9e08b05d811cd27e
 MISC metadata.xml 452 BLAKE2B 21a44f257e58a0a62663b759bdbabfe22c548d2be874365eb4584ce196846890f3342a20ed4be0d4515e1350a5c795b051769003602cfdbdeb35e485d77a4282 SHA512 a42d336a0ee1d8949d2b35e98ff372ac8ddd3bdc5d4733b6195abd1c5e5cfa766bab721a9dc63cfa6ae34fb861a9621da5ea041889638d4bcb6ac2ac9b17fbc5
diff --git a/app-misc/emelfm2/emelfm2-0.9.1-r1.ebuild b/app-misc/emelfm2/emelfm2-0.9.1-r1.ebuild
index 6c74bb99d21a..afac8716bab9 100644
--- a/app-misc/emelfm2/emelfm2-0.9.1-r1.ebuild
+++ b/app-misc/emelfm2/emelfm2-0.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,6 @@ KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="acl ansi gimp gtk3 kernel_linux nls policykit spell udisks"
 
 EMELFM2_LINGUAS=( de fr ja pl ru zh_CN )
-IUSE+=" ${EMELFM2_LINGUAS[@]/#/linguas_}"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.26:2
@@ -46,7 +45,7 @@ src_prepare() {
 
 	local lingua
 	for lingua in ${EMELFM2_LINGUAS[@]}; do
-		use linguas_${lingua} || mv po/${lingua}.po{,.unwanted}
+		has ${lingua} ${LINGUAS-${lingua}} || mv po/${lingua}.po{,.unwanted}
 	done
 }
 
diff --git a/app-misc/emelfm2/emelfm2-0.9.1-r2.ebuild b/app-misc/emelfm2/emelfm2-0.9.1-r2.ebuild
index e3fc45f7773b..f59d82948f66 100644
--- a/app-misc/emelfm2/emelfm2-0.9.1-r2.ebuild
+++ b/app-misc/emelfm2/emelfm2-0.9.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,6 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="acl ansi gimp gtk3 kernel_linux nls policykit spell udisks"
 
 EMELFM2_LINGUAS=( de fr ja pl ru zh_CN )
-IUSE+=" ${EMELFM2_LINGUAS[@]/#/linguas_}"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.26:2
@@ -46,7 +45,7 @@ src_prepare() {
 
 	local lingua
 	for lingua in ${EMELFM2_LINGUAS[@]}; do
-		use linguas_${lingua} || mv po/${lingua}.po{,.unwanted}
+		has ${lingua} ${LINGUAS-${lingua}} || mv po/${lingua}.po{,.unwanted}
 	done
 }
 
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index d7b485ccce5e..3d3fee836748 100644
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
diff --git a/app-mobilephone/gammu/Manifest b/app-mobilephone/gammu/Manifest
index 650c75d4953c..f2d1492572c2 100644
--- a/app-mobilephone/gammu/Manifest
+++ b/app-mobilephone/gammu/Manifest
@@ -6,8 +6,8 @@ DIST gammu-1.33.0.tar.bz2 6535262 BLAKE2B 4a5c22dccfec22f1c4158ac3a98376c7c98776
 DIST gammu-1.36.8.tar.bz2 2095289 BLAKE2B 1c04bc1add840c337499d15c2086155bfb122018cf5b1c6b4c9537a9491f59f57c67b0816c5d3d142fa1d68d6801d3d03468cbde0c228ebd6ebe6830e1f9099f SHA512 4ac86b783570db0105e18ef05fc9408e85d1234ab7de720a232a416ad867d3afbe89db7ed408c06d57f8bb38a2e272f86386f11a89e56f1d750da9e9b579ba09
 DIST gammu-1.38.4.tar.bz2 2132767 BLAKE2B 0780ff2694f7afbe63c5b4c9102005e5f0494932929b635c0252aed52c12e3a3158674b6c49db45459606e77abbe75d8ffb24d52d91ca215b8fae8ba927b7ea6 SHA512 1d4a8e34d3bbc7e4d9797db1acd9be2e92eaec57a87e856ebd168444228a1e89942e69baf1569a0e5645dadea6947338d9e55ae96f632885e95ec1ce74d121ff
 DIST gammu-1.38.5.tar.bz2 2138742 BLAKE2B 7a72a7b67475f73dc3580d618dee379893dc82d7950599b41ed1f7efb5fecd80af3a42a0cc0742cb73d055a4a778eaa4d42037c5be74d9b61a4b53cfe827bd00 SHA512 89a6b3872dfd9b4ebaf8b0f51265fec7e7ef72a42178f85846c7f52d926e96b3087bbe6650c4246e66c2624822021c5803b1bb6ca8ac90f3e5c109a644c0ee80
-EBUILD gammu-1.33.0-r1.ebuild 2625 BLAKE2B 63b27508dca02f32c7535de0c1a9d8f1d62a86d8dc8202ae60f0d1b397c4e1df798803d8412e11dfb8e1ebdc9a7f96d3be40397e23e4ecc47e82d5f31864fb65 SHA512 2402b3fd0578f2ba3be10658d8875e3f7c66cc1320a3744e69977af5708ffb1531f665a35b1f1d9752596e686af9f0bb3b0d44dbdeee5a980bb37b32fa42ff19
-EBUILD gammu-1.36.8.ebuild 2267 BLAKE2B e3e900b1c7abe0dcf30db45116154b79bcc19ac842018bd4fcb4c0cdd19993dbc4e2322c22681bc3c194f021cfbd080b4e6dd5bbc411f001e5f7ba85cf566de0 SHA512 edd340232d300d24382cac2eb4200309d5b654c131e37fea1636796d6057a3ef95aa9db2ee6842b36976a9402cbaeb58b0263fb343d1f242152367a608f264ae
+EBUILD gammu-1.33.0-r1.ebuild 2270 BLAKE2B 6eef098acf0508c5b9b18ed0f309f035de0b10108899762a377fd385871eafaa248bac6f0213c5d90655ff5414a95bbd48055680be89e8014945af4c8ce80fcd SHA512 1c95ed281b6fdfee455398bbf9a4032a10d742362d3063fb6532a2863995dac5ca7016d49b2c0003c1b3a9e00f5820d562b38199c9b34b133f05e2da89e0aa6f
+EBUILD gammu-1.36.8.ebuild 1912 BLAKE2B 83e6abe718efd33889357315945fe3883b7bea5c5b90df3c3a9c2d0c28918a7d8eb49cd4f4d5023b232a960f175cf6b65f711cb8255b6aefef18b030f513b07a SHA512 10b381df708e852bd14f34caf6a6af9090387602f8173e299d5ca1c7b37bd751a9343fa761c1005ff33b7fe9ae63ba10249b3e2af93ecbddcf4355ab42c5461c
 EBUILD gammu-1.38.4.ebuild 1423 BLAKE2B 981a3c92cc9e1a98037cd97302d104ae239e66e3fd54f1050099619b199e46eb6d460d9aa713edbfe1a4677fab13c9f2a31ab28123f6696fa1e0a0b872fc3821 SHA512 9c3934d7c2ebd9132da1f5c5719206f24f4a07bdda3b61600b03c1ed6e9bf9013486800d04c92fd56cef5fd94510efa2d07b1a7b537ae9eb6b693077f3df70b5
 EBUILD gammu-1.38.5.ebuild 1372 BLAKE2B ba3de529a6a705efcc6402ade24eadaee9efcad06257f395ef31ec04a15c43a62c645ad6b5c02b2a51d2e428d29c29ac546e2ab5a20429b6e215b8c3390102a2 SHA512 5d9f020a52ff488f42e50880e7b1ee00c436a7ebbb3d3708219781e4ad377868d49e222237b0ad55942ba038b83565900eb14ad0440cdbe2d109d1716c2c7064
 MISC metadata.xml 981 BLAKE2B 6918eb352c71db64a9ca356408687888123437160f3cf190e0fca10aa31e614b67aad461884fe7f562a036e8ffe500c49e78afa2ab9070e2a32141adf9a55d21 SHA512 9e50aa06f539259b2f8e5eb8c2b8114435e37a4d84965b86c0629d4933d4dd6a3c1e4e62b7dc5c0e653e3194d5ac0fe50bc7b95b26d0ccea5c02e79d19163595
diff --git a/app-mobilephone/gammu/gammu-1.33.0-r1.ebuild b/app-mobilephone/gammu/gammu-1.33.0-r1.ebuild
index f447b749a0bf..f625885a66b4 100644
--- a/app-mobilephone/gammu/gammu-1.33.0-r1.ebuild
+++ b/app-mobilephone/gammu/gammu-1.33.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -34,9 +34,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # sys-devel/gettext is needed for creating .mo files
 # Supported languages and translated documentation
-# Be sure all languages are prefixed with a single space!
 MY_AVAILABLE_LINGUAS=" af ar bg ca cs da de el en_GB es et fi fr gl he hu id it ko nl pl pt_BR ru sk sv sw tr zh_CN zh_TW"
-IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-skip-locktest.patch"
@@ -50,21 +48,12 @@ pkg_setup() {
 src_prepare() {
 	cmake-utils_src_prepare
 
-	local lang support_linguas=no
+	local lang
 	for lang in ${MY_AVAILABLE_LINGUAS} ; do
-		if use linguas_${lang} ; then
-			support_linguas=yes
-			break
+		if ! has ${lang} ${LINGUAS-${lang}} ; then
+			rm -rf locale/${lang} || die
 		fi
 	done
-	# install all languages when all selected LINGUAS aren't supported
-	if [ "${support_linguas}" = "yes" ]; then
-		for lang in ${MY_AVAILABLE_LINGUAS} ; do
-			if ! use linguas_${lang} ; then
-				rm -rf locale/${lang} || die
-			fi
-		done
-	fi
 }
 
 src_configure() {
diff --git a/app-mobilephone/gammu/gammu-1.36.8.ebuild b/app-mobilephone/gammu/gammu-1.36.8.ebuild
index 0f6cb475dc5d..c9f4dafca20e 100644
--- a/app-mobilephone/gammu/gammu-1.36.8.ebuild
+++ b/app-mobilephone/gammu/gammu-1.36.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,9 +36,7 @@ RDEPEND="
 
 # sys-devel/gettext is needed for creating .mo files
 # Supported languages and translated documentation
-# Be sure all languages are prefixed with a single space!
 MY_AVAILABLE_LINGUAS=" af ar bg bn ca cs da de el en_GB es et fi fr gl he hu id it ko nl pl pt_BR ro ru sk sv sw tr zh_CN zh_TW"
-IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-skip-locktest.patch"
@@ -48,21 +46,12 @@ PATCHES=(
 src_prepare() {
 	cmake-utils_src_prepare
 
-	local lang support_linguas=no
+	local lang
 	for lang in ${MY_AVAILABLE_LINGUAS} ; do
-		if use linguas_${lang} ; then
-			support_linguas=yes
-			break
+		if ! has ${lang} ${LINGUAS-${lang}} ; then
+			rm -rf locale/${lang} || die
 		fi
 	done
-	# install all languages when all selected LINGUAS aren't supported
-	if [ "${support_linguas}" = "yes" ]; then
-		for lang in ${MY_AVAILABLE_LINGUAS} ; do
-			if ! use linguas_${lang} ; then
-				rm -rf locale/${lang} || die
-			fi
-		done
-	fi
 }
 
 src_configure() {
diff --git a/app-mobilephone/wammu/Manifest b/app-mobilephone/wammu/Manifest
index 21843e03e1df..daf10e867255 100644
--- a/app-mobilephone/wammu/Manifest
+++ b/app-mobilephone/wammu/Manifest
@@ -1,5 +1,5 @@
 DIST wammu-0.40.tar.bz2 687062 BLAKE2B 413736e40bd2a809123e176f2d00042f407c9a8bea0cc9f4a15561b7f96375c30fa1c8fc65ea8613cc7d369df13fa6841f027e69991ba323374b1dc99bf9c86d SHA512 2ed5d5cdd63b3731808c5fa8cc36caf394c4ccf714eb4ef39a25f1e7967d8ccf8b69db5aeff37ff0d1bbf7cefec51fe070a5f0b90d0cb8271f1a3d243eaf06fd
 DIST wammu-0.43.tar.xz 563832 BLAKE2B 26b075d16d6b26608022eac58260083b7883a3c0b0fe8b73984c625f3ecb2a6ce972cb73bc8e5ebe280726447b6fa188716206f7540a9de42013c221a05589dd SHA512 c8f0aad8d8fc2c852638a77b45d48ba3c512a1e1cf8f8dc54b99a614f7338f366494ef88d786143defd77e55ab9597d9c705569c4e0fceb856f29a05b9c6a843
-EBUILD wammu-0.40.ebuild 1685 BLAKE2B 1dec2393ea0e252853429efea7d8cfc6a44d03e20ae5c32fa21efc356b49d3fae22f29d9b5748ca2101ff2aa13c460dd7ddf2c96d5c68df0e7541216adfd7721 SHA512 5f7352d94a441a8c15473b2991645571f61e9f3b636ed6b47ea321012f28c3ab60cd4a50e9a4662a7e0f416d8c356d726ba70b83071138103a6ce51d92e6a96d
-EBUILD wammu-0.43.ebuild 1639 BLAKE2B 898e672e8c2b6a7d01d59a591bc96ed2f1d9ac33ed44536569e4109a44aebbe8385f266003900ab5d271d19f33fb62fd1981e6b97c4a01369ec966bd96d7e3a7 SHA512 2dbd3107670c4ad36215582b689c9b055a860bbdffb387337a1d96a0369291b2d440412971f4570108fdc29d8bf4d314eeb90eecf6118398c0f3b54c5a60dbf8
+EBUILD wammu-0.40.ebuild 1330 BLAKE2B fa670d94720d09ae68fa20af07ce0ce930a6c119ce8ef77b9c9a42a52128b4cd9dc383c3e6a8cb2d5ce27e6f0149590bfea458b9e492bc69513caa56da321ff3 SHA512 f9f230a881ea613c096466c8255906139a839f8f13ec6861c4795fad1d1a50150c604292172993aec963a51994f1cd5493c6eeffefe031bf05cc2855687f90da
+EBUILD wammu-0.43.ebuild 1284 BLAKE2B e22bf2a9425e6dbe1b600cf54c46c9068589d26528f05be0493fd9e41e781899daef8f9e65770d7665c8665e9aa7e33ce1190d13acc48e098a02ceca38e85651 SHA512 f8075664077424838531afc315bccbc256f5de02a7dcd1e2bbb0d5c02dcb986d32ad62ebdf0cb2fd482ad6f7f6fb0126984579ffbb11c54e2c1f3b979f4fed79
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-mobilephone/wammu/wammu-0.40.ebuild b/app-mobilephone/wammu/wammu-0.40.ebuild
index 9b7861ba00af..320c41fab713 100644
--- a/app-mobilephone/wammu/wammu-0.40.ebuild
+++ b/app-mobilephone/wammu/wammu-0.40.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,29 +25,18 @@ RDEPEND="|| ( ( >=app-mobilephone/gammu-1.36 dev-python/python-gammu )
 DEPEND="${RDEPEND}"
 
 # Supported languages and translated documentation
-# Be sure all languages are prefixed with a single space!
 MY_AVAILABLE_LINGUAS=" af ar bg bn ca cs da de el en_GB es et fi fr gl he hu id it ko nl pl pt_BR ro ru sk sv sw tr uk zh_CN zh_TW"
-IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 
 # Required to source locale content out of the box
 DISTUTILS_IN_SOURCE_BUILD=1
 
 src_prepare() {
-	local lang support_linguas=no
+	local lang
 	for lang in ${MY_AVAILABLE_LINGUAS} ; do
-		if use linguas_${lang} ; then
-			support_linguas=yes
-			break
+		if ! has ${lang} ${LINGUAS-${lang}} ; then
+			rm -r locale/${lang} || die
 		fi
 	done
-	# install all languages when all selected LINGUAS aren't supported
-	if [ "${support_linguas}" = "yes" ]; then
-		for lang in ${MY_AVAILABLE_LINGUAS} ; do
-			if ! use linguas_${lang} ; then
-				rm -r locale/${lang} || die
-			fi
-		done
-	fi
 
 	distutils-r1_src_prepare
 }
diff --git a/app-mobilephone/wammu/wammu-0.43.ebuild b/app-mobilephone/wammu/wammu-0.43.ebuild
index d13beae0c763..dd959761aaee 100644
--- a/app-mobilephone/wammu/wammu-0.43.ebuild
+++ b/app-mobilephone/wammu/wammu-0.43.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,29 +27,18 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 # Supported languages and translated documentation
-# Be sure all languages are prefixed with a single space!
 MY_AVAILABLE_LINGUAS=" af ar bg bn ca cs da de el en_GB es et fi fr gl he hu id it ko nl pl pt_BR ro ru sk sv sw tr uk zh_CN zh_TW"
-IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 
 # Required to source locale content out of the box
 DISTUTILS_IN_SOURCE_BUILD=1
 
 src_prepare() {
-	local lang support_linguas=no
+	local lang
 	for lang in ${MY_AVAILABLE_LINGUAS} ; do
-		if use linguas_${lang} ; then
-			support_linguas=yes
-			break
+		if ! has ${lang} ${LINGUAS-${lang}} ; then
+			rm -r locale/${lang} || die
 		fi
 	done
-	# install all languages when all selected LINGUAS aren't supported
-	if [ "${support_linguas}" = "yes" ]; then
-		for lang in ${MY_AVAILABLE_LINGUAS} ; do
-			if ! use linguas_${lang} ; then
-				rm -r locale/${lang} || die
-			fi
-		done
-	fi
 
 	distutils-r1_src_prepare
 }
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 0ff485baaf27..e4ec7ace64c7 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 334d52f84d89..99d20d611c2c 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -3,6 +3,7 @@ AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0a
 AUX libreoffice-5.4-system-pyuno.patch 1399 BLAKE2B d7516b0ac19509dae8eaaac94acad65e35c71b68ea0f2962c41d9422a89993dc90e76b1f7cd3d19f8f3860b443f063ee1c17024c7f56fd3b8470d2b690eb9c32 SHA512 41b57b857a294b8ac234aaf160dbd380008f716ffdf481b7c733f1dab8702876aad827ab9f1b8f2f26778f0b3a6dfdc9e3ae190188a484d9aeb4568df2e9b418
 AUX libreoffice-5.4.4.2-gtk3-no-gtk-build.patch 436 BLAKE2B 609d8867eee6830e79cbbbce96b260a9401b8b26385bb0af3a4627a8350f046282c9d8084787be03195bc36ed7cd91465b5017ca0801abaca8a0048cc8994bfb SHA512 d2d3e03c2962f4996839808a0c766d60ec897d764b3b1c8c588ba17da7d2d320083f88b8ade5709bbc359e3529ab5c4510806d7ec2a5aa79899b05da6f802851
 AUX libreoffice-5.4.4.2-poppler-0.62.patch 1556 BLAKE2B 73c6218c1b12308b80db6cf93c1cd3d5fa317b5a65832df942c521f931e9bc1b624b1a50b3f7a34e168dad2c4e8ea9db7169b3f3ee27787f3aa1815f771368bc SHA512 759fb125ac09309c4b7dee4ee2d57c4e275b95dd31dbf5df7ff25dec687fd473815ad307dc4dc500ace11823c9f2b2e7bddf5c986fdfa2eddd3051eee7240cae
+AUX libreoffice-6.0.0.1-poppler-0.62.patch 1556 BLAKE2B 58f446358e4c8da29a2afecc9fa1480a11ff3a2c11a750390069013f67c393ce859991b7aeab062f310edd9e7ec4680a2345b8742c5f6850a5af006c17588cbc SHA512 30d55d3d5bbecbe697f7cf735db017d992a41b5032290fce50956187f7e1823fe403613bbdb55cf0ef1b9f2fc3561a479552fb80293cff117c311a838a52686b
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
 DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 BLAKE2B c067f60d0ee325feae4f168ad0f84602708fe724a1d9a9a054ed4991992c1d4637b31083cf569326b8aac1ec598e71ec65fb31ee16233b9c736e97ef062b47d7 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
 DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 BLAKE2B a30b0225313b23092bc57ccd989f26ea04a323dcb17a0ea8baaa6a21b5d5e2b6e29fcae9d18ecd043073030e104ad56c86a115760590f57eda86c22c9fe478b0 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
@@ -16,7 +17,7 @@ DIST libreoffice-help-5.4.2.2.tar.xz 2343504 BLAKE2B 7d446d5b078adc8943be3fced92
 DIST libreoffice-help-5.4.4.2.tar.xz 2343352 BLAKE2B d94528f6dcc85730f2443f3a84beff0cd113bb9c423d767c74d831649e56b0c92279474a0f1169ebc0ffd7804d57dba86aaa352e7fd1d9df9721f3ff6059047c SHA512 55abdde1cf0f62d213a897cc30b92ae04960c9b1e6e69c4f86242d2beecd787f44be9c3d0c8684d775ffe40b17d685a71739c9c2f08753649c4e1298fdf94226
 EBUILD libreoffice-5.4.2.2.ebuild 17284 BLAKE2B 2f1c4a8f7a661b36fa3eaa8559eeeb9e7140cb3e1cc71ca1f4272512e3a268c7e24e60bebd9088a76f06e546bf0307a6e18626fc2e4fe55f04f7ad081befdc27 SHA512 3fde8087bbe39bc3bbf6509bb2faa9635a9e7ced06df58c67f143de24fc49f9e3742d5e61001a28fa9a0d600e8bb5ff72fb578acdd5637ac37c51679408cc810
 EBUILD libreoffice-5.4.4.2.ebuild 17361 BLAKE2B 7fa4ca01338ac8cd9e07288e672ddd033368a5a0281b4c56c2ebe21d6814fec6d1aedf9f06cab4ffa4d0b54f3285cf64781d205926860e3c03907c1b34171086 SHA512 8f551d2d9de46e3ecf10953ece19d9bd005164c6d407e4b980a57dfa74b82d6fce3481d9466a909a938d17cbcf87e27c57e12c186ae8d2c405d9cb32ac76a9b1
-EBUILD libreoffice-5.4.9999.ebuild 17252 BLAKE2B 428ec36f2c5a34e8ae917b665d2e755eb450e3e6429a7b9bc3c752de0acef58456a6ba5e95ed28c826f508027ad2b7a60b2eb348afda1ddc5b70991fd4b57492 SHA512 6ee98390f0f11cfe931cdc4e370c36d485f2cb5b32d2ffc94de94a9824986e0e944b0842a53ee80bf21614c850c17a1dcfceb8c7be8cc72525581c36bb392774
-EBUILD libreoffice-6.0.9999.ebuild 16755 BLAKE2B 280e9dafda7955a3e465336c37493a8d48ed266ddbc1c07d5b74d920a136b09890302fb0ee34956bb41151d31d7ba9bd58085b2dac43362ac388c5383e1060e1 SHA512 a3d58083662497e71904c522ecf5c2475bf00d40b97b81639e274416f2feea3b820a93e86b37c996ef98390b303f0f7b80a24e7c226d3d8f5af63c131bf5ec13
-EBUILD libreoffice-9999.ebuild 16668 BLAKE2B 0625317ed1b43d21ab6e96f001a69f75ae04cccc6bed712bbb6b6e623f0c1e76795420a4275d63ab53b5e4458a7d23c906e7c68b81a1dc1f094e5bd12a39d5db SHA512 e5e80d8bafaf32d0ff3dad306d456c2b2fa09e003974bca70c7742fde62c2215389ac0876c378e0f235ae9bb1953ce961496bb0dc79cc530f0dc9af96003bf41
+EBUILD libreoffice-5.4.9999.ebuild 17313 BLAKE2B 1701bda68e2ebfdba50ed889d6d13a261a6e8127aa2f47aae68a4e7f39d771f716983f8beee7c927244e101783ba9e50512f35a16c959c979d1475c2baff8b55 SHA512 640c75d7e9b1806249d61006b9b6524c28cf68a6b90936effd0dcca45f5b58bc1b327ed2b37fda815d09c827bd3c5805780bf3e65078fea658518d5219e0fc21
+EBUILD libreoffice-6.0.9999.ebuild 16816 BLAKE2B 8a87c931db0b1e672f9f3c171faae5a7a216a650a36e2c49cb5df11a27f1f0dccfa4c903b3b32f33f4f38ceb17c0a5c71a79191b3a994c2292fae7e7fe7a8b5b SHA512 129d1823e47534741fe38d08e61044b2d86f306a0ce410286811df76fa254fd33fcc63adf92d322b3beefa18fb097479675aecc70a10dc9a7ee57f8558d07a5b
+EBUILD libreoffice-9999.ebuild 16729 BLAKE2B dfd7c65cb13718cacf7ab4a845e43473bc3a4d96ca81ca4f31b8528485825dd15653a9a2f1dfcfe449274aedf6c8706f5dfc1e8fd4a3d832ecb051ee7187ddaf SHA512 51567c3a9066b0a17a62c94225e6700458dca4ffe6f3148e955f384c1260097d4bc5a4af47694a69db8981d1264f01f4dd19dd75756a714622e9a71d9bfaa099
 MISC metadata.xml 1393 BLAKE2B 011d5a2e756882852e46eedb9ef66977b93131c570491008a9ebc547b91276bc2e6a7a3db045d3de0758d1ea6ca486d3ea5b4d5c7c667b08534212cce25c0867 SHA512 72cff0c78665cb79e4cb3df72a87af3dc02d9d46f6293a02974602387b50245553d90e1d7d3134d8143ffda809b3a497b43279652ede8ae7eeee9e724918bef7
diff --git a/app-office/libreoffice/files/libreoffice-6.0.0.1-poppler-0.62.patch b/app-office/libreoffice/files/libreoffice-6.0.0.1-poppler-0.62.patch
new file mode 100644
index 000000000000..f0ecc3b990b4
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.0.0.1-poppler-0.62.patch
@@ -0,0 +1,44 @@
+Fix build with >=poppler-0.62.0, cleanup ifdef and raise minimum poppler version.
+
+--- a/configure.ac	2017-12-12 18:45:07.000000000 +0100
++++ b/configure.ac	2018-01-04 23:57:16.410999542 +0100
+@@ -10403,7 +10403,7 @@
+     if test "$with_system_poppler" = "yes"; then
+         AC_MSG_RESULT([external])
+         SYSTEM_POPPLER=TRUE
+-        PKG_CHECK_MODULES( POPPLER, poppler >= 0.12.0 )
++        PKG_CHECK_MODULES( POPPLER, poppler >= 0.21.1 )
+         AC_LANG_PUSH([C++])
+         save_CXXFLAGS=$CXXFLAGS
+         save_CPPFLAGS=$CPPFLAGS
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx	2017-12-12 18:45:07.000000000 +0100
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx	2018-01-05 00:29:16.541246738 +0100
+@@ -32,13 +32,11 @@
+ #pragma warning(push, 1)
+ #endif
+ 
+-// sigh, UTF8.h was removed in poppler-0.21.0 and put back in 0.21.1
+ // FIXME: we can't use #if POPPLER_CHECK_VERSION(0, 21, 0) && !POPPLER_CHECK_VERSION(0, 21, 1)
+ //        because the internal poppler does not provide poppler-version.h and the macro always returns 0
+-#if POPPLER_CHECK_VERSION(0, 21, 1)
+-#include <UTF8.h>
+-#elif POPPLER_CHECK_VERSION(0, 21, 0)
+-#include "UTF.h"
++// UTF8.h was renamed to UnicodeMapFuncs.h in poppler-0.62.0
++#if POPPLER_CHECK_VERSION(0, 62, 0)
++#include "UnicodeMapFuncs.h"
+ #else
+ #include "UTF8.h"
+ #endif
+@@ -918,7 +916,11 @@
+             );
+ 
+     // silence spurious warning
++#if POPPLER_CHECK_VERSION(0, 62, 0)
++    (void)&mapUTF16;
++#else
+     (void)&mapUCS2;
++#endif
+ 
+     char buf[9];
+     for( int i=0; i<uLen; ++i )
diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
index 542f04bac545..d6e9a757db62 100644
--- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -245,6 +245,7 @@ PATCHES=(
 
 	# TODO: upstream
 	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+	"${FILESDIR}/${PN}-5.4.4.2-poppler-0.62.patch" # bug 642602
 )
 
 pkg_pretend() {
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 9b35442a6de3..5fca4ae10c01 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -250,6 +250,7 @@ PATCHES=(
 
 	# TODO: upstream
 	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+	"${FILESDIR}/${PN}-6.0.0.1-poppler-0.62.patch" # bug 642602
 )
 
 pkg_pretend() {
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 664bacbda8ea..ba7d38f7d304 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -249,6 +249,7 @@ PATCHES=(
 
 	# TODO: upstream
 	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
+	"${FILESDIR}/${PN}-6.0.0.1-poppler-0.62.patch" # bug 642602
 )
 
 pkg_pretend() {
diff --git a/app-office/orage/Manifest b/app-office/orage/Manifest
index e66089c5c108..269e30762692 100644
--- a/app-office/orage/Manifest
+++ b/app-office/orage/Manifest
@@ -1,4 +1,4 @@
 DIST orage-4.12.1.tar.bz2 2590788 BLAKE2B 0f00b5704e11923c2ceaac81f0956457402a90f65709c165c98b6942745ea3adee176691555a18548ead258951693187e1b3ce9a718abb3b13c2a1c2a4754e7e SHA512 3fec0201171140586cdc9bcf151450a7086515e18b5815afe4fe4c4726ba554c50582b0479e52985b330140c51b7233ef81f678f986f848afbeee74c66b2d196
-EBUILD orage-4.12.1-r1.ebuild 1543 BLAKE2B c9d48a700621a1856e03093769729dc37675d6ff8c9dc37888e6857e8975584ea4d22740e7660ff373084f4a9c09ef26ff22552912eb65d9e2ea8785ec8f5a1b SHA512 85a96bee0251a2106c92936a9a66a241658abc6b83778f52cb5fc941a7983467013026a00108a8b13d1cd137f7730705732f4483861fe20f5ba35a74100deed6
+EBUILD orage-4.12.1-r1.ebuild 1542 BLAKE2B f5b3df4439b04dff0f61babb30cffa5b9f9a912f0be64be663627963ada664813cbe44b35bc7106f89bb5a69552ed451ba5bf3730b20dc9c6a5a632a6e147a84 SHA512 a104e66d9e4b6552b21837b8c312defe48d28b52cc82a91ece9fc44cc6333adc2418b78146e07ac419a1a4a4f00eb0deb84a21b344884836c61996aee625952b
 EBUILD orage-4.12.1.ebuild 1605 BLAKE2B 9a1afcbf79c3f71a2f825f5688f8f719623294416edb18cee1cdb37dc0aa12e412189d82c2885e272237e316f52e42612692f3849baea43e810c1940c46d908a SHA512 25d2a0f1aa8e63c3b8246efe5ac49ac86c861bef8dc4ee3287dc502a2b09bd6e908684d1ec788d7667ae25ed4e48f84da0b8c3ba53ff8fc65dc44eed6d400128
 MISC metadata.xml 355 BLAKE2B 4ddbf38a80be81b7e131d7c616dfb88dff1e900952c17c4cc4dd26711e720351177d92d8225825dd57354399ecdb8b7bccd18f883fcd927846e8614dd4ac4a99 SHA512 a5d3f875ac31caa10ca77ce8eb38449b3007094d1b9d7d307bd15ee29644c09530d44ac6a4953e10adfa3bd45b6a3fe44dbbb3b80ab7d0c8572c48523ef287eb
diff --git a/app-office/orage/orage-4.12.1-r1.ebuild b/app-office/orage/orage-4.12.1-r1.ebuild
index ab5482d4e4d4..f2b63c1f9460 100644
--- a/app-office/orage/orage-4.12.1-r1.ebuild
+++ b/app-office/orage/orage-4.12.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="berkdb +clock-panel-plugin dbus libnotify"
 
 RDEPEND=">=dev-libs/libical-0.48:=
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 3734e7948581..7cff7e852fe4 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest
index d28e4b9d96f6..563b1eca1dbf 100644
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -7,7 +7,7 @@ DIST mksh-R56b.tgz 415088 BLAKE2B fef8baf664cb61ddfb312e2ec1c81f192478bfdc889ad8
 EBUILD mksh-52.ebuild 1082 BLAKE2B 5d2c18022c68e39de07d10458d85ad6e726fe1b45944b51d44570bbce8b88284f86259b6254ceda26d0c6adc6d2cdf251345b8bbdf0b5abbe202948920711b31 SHA512 90f87cb081ada2babc72b0048b6703beb1c35a3206aa174922b0a4b3b81466d4bbaf96898cd43c778fba62c4e78bde4517317cfe215faa42c77c579b395dcb27
 EBUILD mksh-52b.ebuild 1085 BLAKE2B c400c971f383fa4dddfb1ab063b255e5f0717895ca257800edfd661e7ceda26d072d4a24fbf134f9786911530a71e52e799d753b56042c903c01c270612050a3 SHA512 ca4a8a47682e493fd4c49fa9e35c91300958168136963e5945b8c6952e3d3e4679ee6992c1b7bad8397ccbca8574105906fcfe556b4efc2e50f8c36c8d381e27
 EBUILD mksh-52c.ebuild 1085 BLAKE2B cffad7a2f7e305c8e61364dc8c71ce57d255925298671bff3a4f5639ce20f53e0f30c0f632195e365bfca55f7f810e927bcfaa8c47ff5a3724862d655bc954a7 SHA512 b24cc00634ed94becd73b64a8ed60e2c39d9fa1c6ab2227ac4c82d1acfd892d3c76bd874b53c5599b6693e55ce713b7364dc1d3e0565d69f7a89a247edc60c95
-EBUILD mksh-53a.ebuild 1085 BLAKE2B cffad7a2f7e305c8e61364dc8c71ce57d255925298671bff3a4f5639ce20f53e0f30c0f632195e365bfca55f7f810e927bcfaa8c47ff5a3724862d655bc954a7 SHA512 b24cc00634ed94becd73b64a8ed60e2c39d9fa1c6ab2227ac4c82d1acfd892d3c76bd874b53c5599b6693e55ce713b7364dc1d3e0565d69f7a89a247edc60c95
+EBUILD mksh-53a.ebuild 1090 BLAKE2B 500c5b089bcfd80ab28903e0492866ec961778fba8e9b47b2328d7968ff5e426caf8770f312be1c18522f96f575cc60cd51b01bb7b12f0efab32f02bab3ac54c SHA512 836b10ec92c4139e27ef473e768a56edd19a2b6dac0261f8d0729d9afc2253fe909f85f33fb8c43501df61c3de5348e2e1548f796a924275ca5518343320fe78
 EBUILD mksh-56.ebuild 1085 BLAKE2B 5ce8a8c02755968976048d3597326e5f5a35ac168552fdc6746363bf01b4b4ab1dae6b3b8f81b5fac23e9b0e396c792c5179bfb2e21ad798ff21d0c9a3b5bf3e SHA512 2a8b4e31a3cb2fe1701cd884b2803eade709aeeccafef03327b3f581227b4c919b945c7fe56872d737658207fae09db19498b17285feddea474548779a3b1413
 EBUILD mksh-56b.ebuild 1085 BLAKE2B 5ce8a8c02755968976048d3597326e5f5a35ac168552fdc6746363bf01b4b4ab1dae6b3b8f81b5fac23e9b0e396c792c5179bfb2e21ad798ff21d0c9a3b5bf3e SHA512 2a8b4e31a3cb2fe1701cd884b2803eade709aeeccafef03327b3f581227b4c919b945c7fe56872d737658207fae09db19498b17285feddea474548779a3b1413
 EBUILD mksh-9999.ebuild 1244 BLAKE2B b0ea3d58199d7c3f4ee45140c166bdd1fa535d41228e6690415cde5d2675e89282bdb8ab910a8991d585d76d3f75ce44ce11d5e69a35ab05521499b28e446353 SHA512 636cf54fe70436f74837d1e41fbfcf82dfd2c199a8b6a7fb85b72bf83b32373238b711fdb21fbcf57aab227460337a71a16055f264c76c2beea86cf8587581d5
diff --git a/app-shells/mksh/mksh-53a.ebuild b/app-shells/mksh/mksh-53a.ebuild
index fd3888862257..6f40bc3ba701 100644
--- a/app-shells/mksh/mksh-53a.ebuild
+++ b/app-shells/mksh/mksh-53a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ HOMEPAGE="http://mirbsd.de/mksh"
 SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 DEPEND="static? ( dev-libs/klibc )"
 RDEPEND=""
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 10c0644dcefd..5c8936d231bb 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 7c122481a546..ea226e5d5341 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -6,9 +6,11 @@ AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb8
 AUX calibre-server.conf 523 BLAKE2B a9fb65a327656f9b2f54eab27dcaf2cdfbcbe5f0d637204ea39f891c515ae899da156098609bc99398354337524843afbf45409bbb1098605f293661bb8381e7 SHA512 4595786d9b6ed7662a1124e8acc32e03e0149f614a07890f9df08d05811a1b8de51cc33cc1bfbf30b072c7ad75dc3b8247e9de53d20ee2b45017cb4160437058
 AUX calibre-server.init 1811 BLAKE2B fe22257128896d4299c5d5edab6ac63cdcf79da483f4afc49b0d1649b17599389dd4b9f88c35a964e289cbe6d961136f1e5760a2244137c404e573510899bd60 SHA512 760aa7a8f51b23b116ba07749855737869ff2313f0528d67e5a46bc362e5c0a04a7e1f46c32dd6e82add4fa5dc41d397db32dbd1a09c912008e0890d1a133eeb
 DIST calibre-2.78.0.tar.xz 38739404 BLAKE2B a563883407b8c5cdbc8080ef94d7325eca76f938d0238d0ffd7a6836453a6aa1f5dc06a602eb255cfe99e083734f352bc1e18e6ab1834dd6e003b357ca03b42e SHA512 0779ac385dde45ac4baee7cecb0916e245f3e1cf20662bad9d9a4278265390b1aa89c2b478601b57113e7de08a69343288488ee299e8b43332f0129e650aa0ca
+DIST calibre-3.15.0.tar.xz 38177684 BLAKE2B 7d3892f81db61f8d4a08589a42ccd71183d9dc7fa401480d4426d1205a9a633216a79865140481f63e1e3a741d34f604ea9d7f98c490949d0d4452cb9123fb9b SHA512 93a9f3b7122d8f4cd1d847727f6d1ccd1f9d828651e9ee77a34544742884b3e925552ca61ec1d0a1196b04a0874e97fc877e679dd8a69ba8b754b7688b730697
 DIST calibre-3.3.0.tar.xz 36308116 BLAKE2B fe331df77ed256fb509028e777bd628cb7b316ae99d594c7335216c08e509de32df03ebe3c1393e2cdf6618b4a3820458d2bf9045380c43f979218544cb7757d SHA512 bb63f83d5e35079daba9ec6e7849e6a65c51cf0b2da9fc45b86a2b64cc147f862f08413730f3d2710793de7b045fc73913534dfca11b128ad0ea72e92033f977
 DIST calibre-3.8.0.tar.xz 37922608 BLAKE2B 6ae465da15a50f45621753b4f8fdcb978fa3b3cf170575cca0a9e4ae3cd324fbb4b194861180961539f8057ce3650066d7113368dee404d899ed8ca1a58f80e6 SHA512 db7ff5cb0ee82b3237090cbf6a13d13bfa5e27139dd067290ed59d407d2dbbae2ecd3dab338a0beed845079387a051b092233350091ef6ec82623d3a16b1d48d
 EBUILD calibre-2.78.0.ebuild 8033 BLAKE2B aa37993a33ea21f966b27673b972187c6fc0270ccd8db61af32114e7fe99cb39386399e55be7960196c2c419f87bb987a3f4e9ed335cdf5a4fcc8b6848f93c87 SHA512 c65f281218b26c1f77c6e226ab86bce7dab3089c99e5a8be39b52cf6f77c643520cfb5a1026d303a09964044bfe6c9ff2f5dc1fef1a625a61354a9d950d43487
+EBUILD calibre-3.15.0.ebuild 8880 BLAKE2B 13ea9ab57da2e5fce9e71707dc8711b6a95c642a12929e7144050f3b3aad01304fb9b00bfff6dac410dfb46cb4da47fb0cd94afcf3cd9b418fe130c2c54453d1 SHA512 6dace15dc9be284ad89113c8c6b9387b6bf30a4c3e2500dfc635c921d3a3d4cf8213e5731989bdb18fa2b8c7b1bff07c889f220cd799f07b076c7ebef85ac415
 EBUILD calibre-3.3.0.ebuild 8800 BLAKE2B be17c2dfa92c94084805d2c8dd736f8f8369b79bf2af8b78ce5a0cc0288162f97856a0c792e441b94635eb22ea4493785db72d02ce337beaecab199aafaa9833 SHA512 581cb6b0331a058b013cf32de5b7d87b7ddf35482f91c62dbb947d392c90d46cf58690780534a1bb2c243dca2cee1b015b0ef361ed9763fe3cddd20ef2faafb8
 EBUILD calibre-3.8.0.ebuild 8843 BLAKE2B 5bc3d0722e890fed9a95292f8fe6e27dcc5d502a4850335bf221f1cd6a9c6ec0c703819a199d79b0ab01b72ffbd0134d48b4435a6ed30c91272843b0b4a5193a SHA512 41a12022df5a61a6b7308a65c34cb04eb25187d6da72691bfe6d60f39b7fe6e33ce48fe4fd03d576193df41e246bfc61c0086266f1584093739a0709602b949a
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-3.15.0.ebuild b/app-text/calibre/calibre-3.15.0.ebuild
new file mode 100644
index 000000000000..ec7d26d14536
--- /dev/null
+++ b/app-text/calibre/calibre-3.15.0.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs python-single-r1
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="http://calibre-ebook.com/"
+SRC_URI="http://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+	unRAR
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/podofo-0.8.2:=
+	>=app-text/poppler-0.26.5[qt5]
+	>=dev-libs/chmlib-0.40:=
+	dev-libs/glib:2=
+	>=dev-libs/icu-57.1:=
+	dev-libs/libinput:=
+	>=dev-python/apsw-3.13.0[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/cssutils-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
+	>=dev-libs/dbus-glib-0.106
+	>=sys-apps/dbus-1.10.8
+	dev-python/html5-parser[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/mechanize-0.2.5[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5=
+	dev-qt/qtdbus:5=
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5=
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-libs/libwmf-0.2.8
+	>=media-gfx/optipng-0.7.6
+	sys-libs/zlib:=
+	virtual/libusb:1=
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	x11-libs/libxkbcommon:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
+	>=virtual/podofo-build-0.9.4
+	virtual/pkgconfig"
+
+src_prepare() {
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	eapply \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+
+	eapply_user
+
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/build.py || die "sed failed to patch build.py"
+
+	# use system beautifulsoup, instead of bundled
+	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
+		|| die "could not remove bundled beautifulsoup"
+	find "${S}" -type f -name \*.py -exec \
+		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
+		|| die "could not sed bundled beautifulsoup out of the source tree"
+
+	# avoid failure of xdg tools to recognize vendor prefix
+	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
+		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
+		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
+		-i "${S}"/src/calibre/linux.py || die 'sed failed'
+
+	# don't create/install uninstaller
+	sed '/self\.create_uninstaller()/d' -i src/calibre/linux.py || die
+}
+
+src_install() {
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANGUAGE
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
+	local x
+	for x in /dev/dri/card[0-9] ; do
+		[[ -e ${x} ]] && addpredict ${x}
+	done
+
+	#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
+	#dodir $(python_get_sitedir)
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}usr" \
+		--staging-libdir="${ED}usr/${libdir}" || die
+
+	# The menu entries end up here due to '--mode user' being added to
+	# xdg-* options in src_prepare.
+	dodir /usr/share/mime/packages
+	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
+	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
+		die "failed to register mime types"
+	dodir /usr/share/icons
+	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
+		die "failed to install icon files"
+
+	domenu "${HOME}"/.local/share/applications/*.desktop ||
+		die "failed to install .desktop menu files"
+
+	find "${ED}"usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"usr/lib/calibre
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+
+	bashcomp_alias calibre \
+		lrfviewer \
+		calibre-debug \
+		ebook-meta \
+		calibre-server \
+		ebook-viewer \
+		ebook-polish \
+		fetch-ebook-metadata \
+		lrf2lrs \
+		ebook-convert \
+		ebook-edit \
+		calibre-smtp \
+		ebook-device
+
+}
+
+pkg_preinst() {
+	# Indentify stray directories from upstream's "Binary install"
+	# method (see bug 622728).
+	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
+	CALIBRE_LIB_CONTENT=$(for x in "${ED%/}${CALIBRE_LIB_DIR}"/*; do
+		printf -- "${x##*/} "; done) || die "Failed to list ${ED%/}${CALIBRE_LIB_DIR}"
+}
+
+pkg_postinst() {
+	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+	local x
+	for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do
+		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+			elog "Purging '${x}'"
+			rm -rf "${x}"
+		fi
+	done
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/diffpdf/Manifest b/app-text/diffpdf/Manifest
index a7ccbc765da2..10492097d14b 100644
--- a/app-text/diffpdf/Manifest
+++ b/app-text/diffpdf/Manifest
@@ -1,3 +1,5 @@
+AUX diffpdf-2.1.3-qt5.patch 6240 BLAKE2B c4f522b41e4b036222f832e194088d2377f5063d35e8eb73714745db7a993d9b38fd9e5111eee69d7f2d86710a45289a8e54d25b8a3217b1ddd2fe53bd59b468 SHA512 96ae465bb5b27ff0b26a7c4686e7656af025669b418b755878627b1baf4b91bf14833e951f80c6510d907419efdb8759dffca3f5b7fb517b5bf20ae1ee6b3406
+AUX diffpdf.desktop 152 BLAKE2B e85754380c3e607d6bfe0f4db875983596f8e562d48b8bb732e26a23f9cb6137d7ec700ac2d0596fa3a13d79b6c527de671f46825646e266cf5579f33a1a1511 SHA512 3568a49e3fdcb2fa47688fce4d818cb01545d854890806e4508f228b18b712cbb5641a6e173927990e81c9086bdb49f5b4ffd870e5f0345f26de1b4e799eb0d7
 DIST diffpdf-2.1.3.tar.gz 91856 BLAKE2B a94b710674508a5b77ca1e18b48e906568b49ecf10ce5f96d425fceb91746922fdf454ee20ec77913cf3d7467e559e59257e7415bf96c44b9c136e1708d4e73f SHA512 137e00f7c1d696b097f271c51fa5f19d471efb85fb3d5381c096c32f1ff824083b1122bbefa758fb9320ac8e0c9c16e6b88c8b6286bd98388d88c45c714a948d
-EBUILD diffpdf-2.1.3.ebuild 678 BLAKE2B b02353d8a5f25b2500f04c63c8f810e5cd1c5ea0cca37f27b3df579016a976b28f28e499f4e7229e2b0dff6ca732d04b96c139e364f4f0307083d2ab6a848af5 SHA512 36af124c32eb8a4255dd137e83ae5c05253ba706088d8144f0e38d1146db1b40ec4653dbddbf6d5c41407208550b8193960e91954d8eceb52fae2dd4eb3ee476
+EBUILD diffpdf-2.1.3-r1.ebuild 801 BLAKE2B 7b1e48d31371bb35da8e84e3cdc2e8d88449e3a772f1f12171bc93e61a936ec49d3ef854d6022b49a295b4b1cb79c5d75e338300e91ba0735e73918c622d67cb SHA512 ed8a68efb77814f627f4ab85d195697814942ab2976e6f415ac3481db967921bd5919515175b0072c4630ff87272d1dda0729bacada1ee05ee03619aaa8ce400
 MISC metadata.xml 247 BLAKE2B 317f906045f70ecc77ab85491b683c74618c027d768a499226ea0c46d214b783ff308f6bcb79c1edfaf3c4a01821afd529786bf5ad2cf73e0570aac56177d36e SHA512 4ae39ceedf573357554a383ccfab1d716abb7265c3a1eb407d1dc4bf3b38fc91b5cdeec8ba0bad84efb2595aebb6d115ade1575e12812079e47797b7dcd3fa7a
diff --git a/app-text/diffpdf/diffpdf-2.1.3-r1.ebuild b/app-text/diffpdf/diffpdf-2.1.3-r1.ebuild
new file mode 100644
index 000000000000..1de17d540dfc
--- /dev/null
+++ b/app-text/diffpdf/diffpdf-2.1.3-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop qmake-utils
+
+DESCRIPTION="Program that textually or visually compares two PDF files"
+HOMEPAGE="http://www.qtrac.eu/diffpdf.html"
+SRC_URI="http://www.qtrac.eu/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	app-text/poppler:=[qt5]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+PATCHES=( "${FILESDIR}"/${P}-qt5.patch )
+
+src_configure() {
+	$(qt5_get_bindir)/lrelease diffpdf.pro || die "Generating translations failed"
+	eqmake5 PREFIX="${EPREFIX}/usr" diffpdf.pro
+}
+
+src_install() {
+	einstalldocs
+	dobin diffpdf
+	doman diffpdf.1
+	domenu "${FILESDIR}"/${PN}.desktop
+	newicon images/icon.png ${PN}.png
+}
diff --git a/app-text/diffpdf/diffpdf-2.1.3.ebuild b/app-text/diffpdf/diffpdf-2.1.3.ebuild
deleted file mode 100644
index 51e213918991..000000000000
--- a/app-text/diffpdf/diffpdf-2.1.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-r2 eutils qmake-utils
-
-DESCRIPTION="Program that textually or visually compares two PDF files"
-HOMEPAGE="http://www.qtrac.eu/diffpdf.html"
-SRC_URI="http://www.qtrac.eu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	app-text/poppler:=[qt4]
-	>=dev-qt/qtcore-4.6:4
-	>=dev-qt/qtgui-4.6:4
-"
-RDEPEND="${DEPEND}"
-
-DOCS="README"
-
-src_configure() {
-	$(qt4_get_bindir)/lrelease diffpdf.pro || die 'Generating translations failed'
-	qt4-r2_src_configure
-}
-
-src_install() {
-	qt4-r2_src_install
-
-	dobin diffpdf
-	doman diffpdf.1
-}
diff --git a/app-text/diffpdf/files/diffpdf-2.1.3-qt5.patch b/app-text/diffpdf/files/diffpdf-2.1.3-qt5.patch
new file mode 100644
index 000000000000..a7821388aa87
--- /dev/null
+++ b/app-text/diffpdf/files/diffpdf-2.1.3-qt5.patch
@@ -0,0 +1,173 @@
+Description: Build with Qt5
+ Enough changes to make things build with Qt5
+Author: Sune Vuorela <sune@debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2017-11-25
+
+--- diffpdf-2.1.3.orig/aboutform.cpp
++++ diffpdf-2.1.3/aboutform.cpp
+@@ -11,7 +11,6 @@
+ */
+ 
+ #include "aboutform.hpp"
+-#include <poppler-version.h>
+ #include <QApplication>
+ #include <QHBoxLayout>
+ #include <QSettings>
+@@ -52,7 +51,7 @@ AboutForm::AboutForm(QWidget *parent) :
+     "</ul>"
+     "I also provide training and consultancy in C++, Go, Python&nbsp;2, "
+     "Python&nbsp;3, C++/Qt, and PyQt4.").arg(qApp->applicationName())
+-            .arg(Version).arg(qVersion()).arg(POPPLER_VERSION));
++            .arg(Version).arg(qVersion()).arg("Qt 5"));
+     QTextBrowser *contributorsBrowser = new QTextBrowser;
+     contributorsBrowser->setReadOnly(true);
+     contributorsBrowser->setHtml(tr("<table>"
+--- diffpdf-2.1.3.orig/diffpdf.pro
++++ diffpdf-2.1.3/diffpdf.pro
+@@ -31,35 +31,39 @@ TRANSLATIONS += diffpdf_fr.ts
+ TRANSLATIONS += diffpdf_de.ts
+ TRANSLATIONS += diffpdf_es.ts
+ CODECFORTR    = UTF-8
+-LIBS	     += -lpoppler-qt4
++LIBS	     += -lpoppler-qt5
++ QMAKE_CFLAGS += $$(CPPFLAGS) $$(CFLAGS)
++ QMAKE_CXXFLAGS += $$(CPPFLAGS) $$(CXXFLAGS)
++ QMAKE_LFLAGS += $$(LDFLAGS)
++QT += widgets printsupport
+ win32 {
+     CONFIG += release
+ }
+ exists($(HOME)/opt/poppler024/) {
+     message(Using locally built Poppler library)
+     INCLUDEPATH += $(HOME)/opt/poppler024/include/poppler/cpp
+-    INCLUDEPATH += $(HOME)/opt/poppler024/include/poppler/qt4
++    INCLUDEPATH += $(HOME)/opt/poppler024/include/poppler/qt5
+     LIBS += -Wl,-rpath -Wl,$(HOME)/opt/poppler024/lib -L$(HOME)/opt/poppler024/lib
+ } else {
+     exists(/poppler_lib) {
+ 	message(Using locally built Poppler library on Windows)
+ 	INCLUDEPATH += /c/poppler_lib/include/poppler/cpp
+-	INCLUDEPATH += /c/poppler_lib/include/poppler/qt4
++	INCLUDEPATH += /c/poppler_lib/include/poppler/qt5
+ 	LIBS += -Wl,-rpath -Wl,/c/poppler_lib/bin -Wl,-L/c/poppler_lib/bin
+     } else {
+-	exists(/usr/include/poppler/qt4) {
++	exists(/usr/include/poppler/qt5) {
+ 	    INCLUDEPATH += /usr/include/poppler/cpp
+-	    INCLUDEPATH += /usr/include/poppler/qt4
++	    INCLUDEPATH += /usr/include/poppler/qt5
+ 	} else {
+ 	    INCLUDEPATH += /usr/local/include/poppler/cpp
+-	    INCLUDEPATH += /usr/local/include/poppler/qt4
++	    INCLUDEPATH += /usr/local/include/poppler/qt5
+ 	}
+     }
+ }
+ #exists($(HOME)/opt/podofo09/) {
+ #    message(Using locally built PoDoFo library)
+ #    INCLUDEPATH += $(HOME)/opt/podofo09/include/poppler/cpp
+-#    INCLUDEPATH += $(HOME)/opt/podofo09/include/poppler/qt4
++#    INCLUDEPATH += $(HOME)/opt/podofo09/include/poppler/qt5
+ #    LIBS += -Wl,-rpath -Wl,$(HOME)/opt/podofo09/lib64 -Wl,-L$(HOME)/opt/podofo09/lib64
+ #} else {
+ #    exists(/usr/include/podofo) {
+--- diffpdf-2.1.3.orig/generic.hpp
++++ diffpdf-2.1.3/generic.hpp
+@@ -12,7 +12,7 @@
+     for more details.
+ */
+ 
+-#include <poppler-qt4.h>
++#include <poppler-qt5.h>
+ #include <QMetaType>
+ #include <QPair>
+ #include <QPixmap>
+--- diffpdf-2.1.3.orig/helpform.cpp
++++ diffpdf-2.1.3/helpform.cpp
+@@ -11,7 +11,6 @@
+ */
+ 
+ #include "helpform.hpp"
+-#include <poppler-version.h>
+ #include <QApplication>
+ #include <QFile>
+ #include <QKeySequence>
+--- diffpdf-2.1.3.orig/label.cpp
++++ diffpdf-2.1.3/label.cpp
+@@ -15,6 +15,7 @@
+ #include <QDragEnterEvent>
+ #include <QDragEnterEvent>
+ #include <QMouseEvent>
++#include <QMimeData>
+ 
+ Label::Label(QWidget *parent) : QLabel(parent)
+ {
+--- diffpdf-2.1.3.orig/lineedit.cpp
++++ diffpdf-2.1.3/lineedit.cpp
+@@ -14,6 +14,7 @@
+ #include "lineedit.hpp"
+ #include <QDragEnterEvent>
+ #include <QDragEnterEvent>
++#include <QMimeData>
+ 
+ 
+ LineEdit::LineEdit(QWidget *parent) : QLineEdit(parent)
+--- diffpdf-2.1.3.orig/main.cpp
++++ diffpdf-2.1.3/main.cpp
+@@ -31,7 +31,6 @@ int main(int argc, char *argv[])
+     app.setOrganizationDomain("qtrac.eu");
+     app.setApplicationName("DiffPDF");
+     app.setWindowIcon(QIcon(":/icon.png"));
+-    QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
+ 
+     QTextStream out(stdout);
+     QStringList args = app.arguments().mid(1);
+--- diffpdf-2.1.3.orig/mainwindow.hpp
++++ diffpdf-2.1.3/mainwindow.hpp
+@@ -19,7 +19,7 @@
+ #else
+ #include <tr1/memory>
+ #endif
+-#include <poppler-qt4.h>
++#include <poppler-qt5.h>
+ #include <QBrush>
+ #include <QList>
+ #include <QMainWindow>
+--- diffpdf-2.1.3.orig/optionsform.cpp
++++ diffpdf-2.1.3/optionsform.cpp
+@@ -76,9 +76,9 @@ void OptionsForm::createWidgets()
+             << qMakePair(tr("Diagonal \\"), Qt::FDiagPattern)
+             << qMakePair(tr("Diagonal Cross"), Qt::DiagCrossPattern))
+         brushStyleComboBox->addItem(brushSwatch(pair.second, color),
+-                                                pair.first, pair.second);
++                                                pair.first, QVariant::fromValue(pair.second));
+     brushStyleComboBox->setCurrentIndex(brushStyleComboBox->findData(
+-                brush.style()));
++                QVariant::fromValue(brush.style())));
+ 
+     penStyleComboBox = new QComboBox;
+     typedef QPair<QString, Qt::PenStyle> PenPair;
+@@ -90,9 +90,9 @@ void OptionsForm::createWidgets()
+             << qMakePair(tr("Dash-Dotted"), Qt::DashDotLine)
+             << qMakePair(tr("Dash-Dot-Dotted"), Qt::DashDotDotLine))
+         penStyleComboBox->addItem(penStyleSwatch(pair.second, color),
+-                                  pair.first, pair.second);
++                                  pair.first, QVariant::fromValue(pair.second));
+     penStyleComboBox->setCurrentIndex(penStyleComboBox->findData(
+-                pen.style()));
++                QVariant::fromValue(pen.style())));
+ 
+     alphaSpinBox = new QSpinBox;
+     alphaSpinBox->setRange(1, 100);
diff --git a/app-text/diffpdf/files/diffpdf.desktop b/app-text/diffpdf/files/diffpdf.desktop
new file mode 100644
index 000000000000..1f4d0cb0d090
--- /dev/null
+++ b/app-text/diffpdf/files/diffpdf.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=DiffPDF
+Comment=Compare two PDF files
+Exec=diffpdf
+Icon=diffpdf
+Terminal=false
+Type=Application
+Categories=Utility;Qt;
diff --git a/app-text/krop/Manifest b/app-text/krop/Manifest
index b7b23828e0d3..6ea56233a7a3 100644
--- a/app-text/krop/Manifest
+++ b/app-text/krop/Manifest
@@ -1,5 +1,3 @@
 DIST krop-0.4.13.5.tar.gz 40079 BLAKE2B 9d3505f7d9cbf0eef4ec7a28928f14940e6c0a2fd4499b6c5896fde7b3f7b8a0b84ddc4f9c7735ee348f89e9924a7b8f69a3d4dbfaa4668ac770a0fe8404d469 SHA512 218eb3e256dabcacc53af62b2e704031bd21bedacf2599c4aed7ee3b3847b35741c921a08137b7b6e7295ddfc7f87f4ffbf9d3fec3fb137d1ce36e3945dc6129
-DIST krop-0.4.13.tar.gz 36654 BLAKE2B 87c6ae2435ba7f4f7d5d8ad19f4804a1e45b9bb44bef7e03b46cf6e3c1a59cdf5dfd81a7a7d8c26a0f09b75e7d3dcdfa28b4795a786f8eb06d95881eacfc7cee SHA512 2d2af25124b45108715eb90344a5683adbda4c788bd419360b641e9f47553fe143a40205a44af9b3e4db6df4148b3328547e774f24b5c7c0fd23c9206e8a14b2
-EBUILD krop-0.4.13.5.ebuild 713 BLAKE2B 4b18cd8a175c62ea18e6fb7864bdc2995d54b27185ec4754538bdcb2c2176931532490d34f3a13f246c2d29f8c68c642fb23175e2328d1dfc79275342cf8c9c8 SHA512 deb6d8d593a350a026cb26ce9f425b736938ebd694686dd2b9fc954df131d6ca3921222cf500d681115c6163108448b3f049d8f8b2cefb3c971c614055c6465a
-EBUILD krop-0.4.13.ebuild 609 BLAKE2B a740a07ac30a2c7f3e2120f29eb9d54793b1b17705b0c50654f52a3e52face3cfd1d18d2acca69708bc8e2115cd31a10d708561e8d9aabc2b5adef0653966c2e SHA512 a0dd10fa9ede60ae319817da497cb5be4256e3fa2d6d98d1998f8f93fd88609ff31c80d8446d3757c501d338b48eb68008a63046667255a93583637010ec65b8
+EBUILD krop-0.4.13.5.ebuild 881 BLAKE2B 5a73a8b0ae93c3aae190cf8df89c437fca569ecd59b0efc67224658f943c02a3a885c8f4299ea2f7e58beb9056cdc0c32a0311a99306d6fbea3f67ca575cba3e SHA512 9bec5c026b6f772d3c7a10a16727b14962d356279740eaebf83983839a3f46d997ff2a4135fa7c635b97d388e9f779428ec0b485a78c263fbb8bdbfe776fe201
 MISC metadata.xml 333 BLAKE2B b62d23170b13a4d2375de72955c2708368a34435f022231b829b19b60c9f38a1546ec62887dae545691eb1df45998ab7810aa58df3b94729632991e49c4c098f SHA512 30ec13878bbe3b50c90f1849bbc5bf0f8dc05bf1b6a8f79695590f48c76618eef4666965b8130d1909db3c960a43d3149dba525017f342ce9635afc530b873f0
diff --git a/app-text/krop/krop-0.4.13.5.ebuild b/app-text/krop/krop-0.4.13.5.ebuild
index 23966dc8cf43..108c5f32c840 100644
--- a/app-text/krop/krop-0.4.13.5.ebuild
+++ b/app-text/krop/krop-0.4.13.5.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
-inherit eutils distutils-r1
+inherit eutils distutils-r1 xdg-utils
 
 DESCRIPTION="A tool to crop PDF files"
 HOMEPAGE="http://arminstraub.com/software/krop"
 #SRC_URI="http://arminstraub.com/downloads/${PN}/${P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~huettel/distfiles/${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
 # this is a snapshot of the qt5 branch
 
 LICENSE="GPL-3"
@@ -25,3 +25,13 @@ src_install() {
 	distutils-r1_src_install
 	domenu "${WORKDIR}/${P}/${PN}.desktop"
 }
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/app-text/krop/krop-0.4.13.ebuild b/app-text/krop/krop-0.4.13.ebuild
deleted file mode 100644
index a4a95ac16ae7..000000000000
--- a/app-text/krop/krop-0.4.13.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit eutils distutils-r1
-
-DESCRIPTION="A tool to crop PDF files"
-HOMEPAGE="http://arminstraub.com/software/krop"
-SRC_URI="http://arminstraub.com/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
-	dev-python/PyPDF2[${PYTHON_USEDEP}]
-	dev-python/PyQt4[${PYTHON_USEDEP}]"
-
-src_install() {
-	distutils-r1_src_install
-	domenu "${WORKDIR}/${P}/${PN}.desktop"
-}
diff --git a/app-text/libabw/Manifest b/app-text/libabw/Manifest
index cf98be646a29..51085dbde510 100644
--- a/app-text/libabw/Manifest
+++ b/app-text/libabw/Manifest
@@ -2,5 +2,7 @@ AUX libabw-0.1.1-boost-1.59.patch 1077 BLAKE2B d7c9883639c9148ac5a1c4faf06d6f5cc
 AUX libabw-0.1.1-dereference-before-null-check.patch 989 BLAKE2B 92276e79e393805847d570dfec195b8d4dbeeb6f106f4d46f31bd801f927e8ea0e481e8e40ab72861900a7282f0a57e3733bf3d491ff47451784b476025634f1 SHA512 a9b3e07d4ca41579a44c0953e2934f9e8e4abbc5c42c50a71f64c5a665f6b2b35e93facd4822546342f349b78f19d9203598818fce3f19833c9c6bd4e3c5b694
 AUX libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch 1308 BLAKE2B 9e368b07ddd2ec2a983a94a55344aa2c7e0560f435e589c609fa0cc9837cda14c433b50c20be11309dd95d5851a0d5053ffe19c353982821843ccbd29cfdd3e9 SHA512 1bd8c97e171b489e4c183a73452a0fb33e98bb3dfb184dc9abc4989ab9f43ee43ee09ee319f6f1291b4141f759f2495b7a5b65c86b8d0f9bdcb0fc50a23fd242
 DIST libabw-0.1.1.tar.xz 287628 BLAKE2B c8873512d7bb4c6594330dd35f044a6d6fb7bd07f4b915b5f0d0752ae36c9c6d2c8a5e7e7f66947fb5c27256e0701214b3fe171e1f52c09cfd42bbf106bc689e SHA512 853dd86ecc79e8590d3163e05e145ad66240ae3cf12d206d021775a94bfb33d70aa5acdcdd193ac747baeae1ba0eed18099ea6f4515be23bdd70b431e96c4b1a
+DIST libabw-0.1.2.tar.xz 318400 BLAKE2B ba25542da0d6568530241892dbdba72d2b0dcf667b50e0c1a4e656e0facf82bf77ca8eff8db4d6e57ab699f12d8dad511d32aee291541ffe6460b2ee98590b68 SHA512 a365c1aa047a97a86eee6bce8463646bdf248a51013139ee288402a832fd545586e072d7c7fc11a56f42e3637de9e922197be20d0587e53c51fd80ced409a6cd
 EBUILD libabw-0.1.1.ebuild 1002 BLAKE2B 3d7fd086fa2281218e72065308bb6a041674a40e39aa1be0616cff80d67ff8f7a8b1ca817eecef398e13f042a523e5268c31b6e7129cb1512f5580aa71d9416d SHA512 bb979320eecd5bd653cc0fcaa37a7ca025dfe1b83ce76a9b99d6766ebd56483f76b4d22dde07d6591862c6997ac2705bc4a065e1b4d2c766f8f39763a1e2e27f
+EBUILD libabw-0.1.2.ebuild 797 BLAKE2B a36f3a09a84a8568bc8204e10b64399ba38ba21f9bd3a2bc1466d2353375e223ea68c96206f6c14b50479aa8d811cce87f5b9f6d841a576c6e878685f792697c SHA512 8f3121a61622c1a3868fd9d9e346b4b799e6ee87f2aae6c20228bb268ee57f0362f6bdd9f658719efe27504d552b5f5e770623a11674267a9163ad8a74b6620a
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libabw/libabw-0.1.2.ebuild b/app-text/libabw/libabw-0.1.2.ebuild
new file mode 100644
index 000000000000..9db45bfc4cfa
--- /dev/null
+++ b/app-text/libabw/libabw-0.1.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Library parsing abiword documents"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libabw"
+SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libebook/Manifest b/app-text/libebook/Manifest
index c1aafa5eb6bd..354fb74f8c52 100644
--- a/app-text/libebook/Manifest
+++ b/app-text/libebook/Manifest
@@ -1,5 +1,7 @@
 AUX libebook-0.1.2-boost-1.59-makefile.patch 335 BLAKE2B 21b62202de334b214e4dd04ea2d06e23fdacb49d35020a7e874f27cadecc13dd96221826469bac50d063583b2f10e93cd325d53fa6cff181ab806bb83623cf02 SHA512 fe435d531d0b4646d8642dfa471352519e3e606b31c3fe727ebbd1ebecdeef58663aadbd7ae95ac902055074b550b659c7eb5cc981a078315462da9a892abe43
 AUX libebook-0.1.2-tests.patch 784 BLAKE2B b7f2aa5b5abace8fb1276c534ef564d8e088b514569540d940f433b5d293a497e211782059186688d94db8139b1f9f0859180f59ea4ac7c0e9c86ca10d11a934 SHA512 e176746ed85e0564332b7ed6e375f0869931e7f489d734dc1ecbd685af595ce1247f933a82736c239df322d57505c40cd23af434db711b8087ee77e26de2c1ad
 DIST libe-book-0.1.2.tar.bz2 465922 BLAKE2B 11898cb34d41a6abbf256ed8a7ff44006f239616987ca5883a8a611041bcda2cce221acc00c57cd36d94f8c26510889df3206ca4f071c23ae272262938e2c396 SHA512 82982874f9c0f5e400166e9367a4b6017cf11bbd69e2e79240137385a5d68ddea08f13676f8c5d0e983f441de17cda9f4b5f7c90c5cb3515e319de638edf3a38
+DIST libe-book-0.1.3.tar.bz2 510498 BLAKE2B e29f9f80a85210447494af20cf30ce7f231ef43f40af9683df7f63e172f5ff8d944d74b995b5850856b2736044b1a5a1ac386262e52a48575325339224a1d339 SHA512 9afa2949f702a34fd6278145ce8d18d504326ed5a103bbc872d0493fcf3e2166d41d094bb0d74b80aa913ca6d082f5bd3259799a4a3c7359331ccdfa1e029a21
 EBUILD libebook-0.1.2-r1.ebuild 1022 BLAKE2B 818b0f0ec8ea3040383fa8997279019fb6de3cff6d4b396013116fc1a07f9481ed77a9a199437ee5668c4d98858e528fd0d5f9c4676725e83bac6f6326f47a03 SHA512 6532e18f8add0ec7405877df28901bfda5e9c62d2e121d12f0a952812bc28c911dd1dce03111c1d7fd6ada9c70dfb67bd46a7c486510cb04dbfe51990133b6fb
+EBUILD libebook-0.1.3.ebuild 954 BLAKE2B aa6bfd160dd3067c93d772959cc7e00ca7cbb6384c84ee08985d9a13bb70ecfd7032bf8230f6ab3a24d1ab400aa59b07ffbc5d1d34f9abbfc35de621c91f6fb9 SHA512 5c7881f7799a9686eb4400356aaae3215c7e52b803977116e4ca7ea59fbd0a71726547135d22932659fd1f995539da60a7363377c53f05642ebb79c219b86fa7
 MISC metadata.xml 404 BLAKE2B 69f06dd52ba8be857d504941c4aeb6778381d87d61f1c9a889a6c1ad16a9d7014dabf76c707db2ed6a160be300a010e6d15c2162d35e59ddd038181a4aa7fae8 SHA512 8e0679b60d1fd56fcb165fd7b5a8e1367f4ee472d7a58e157e6bb1445b502b1fee56b18d099837dcabaa35f7b18f52515cbb51f7bfe9c4c2a824210e4003a275
diff --git a/app-text/libebook/libebook-0.1.3.ebuild b/app-text/libebook/libebook-0.1.3.ebuild
new file mode 100644
index 000000000000..e58db48faea1
--- /dev/null
+++ b/app-text/libebook/libebook-0.1.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="libe-book"
+MY_P="${MY_PN}-${PV}"
+
+inherit autotools
+
+DESCRIPTION="Library parsing various ebook formats"
+HOMEPAGE="http://www.sourceforge.net/projects/libebook/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc test tools"
+
+RDEPEND="
+	app-text/liblangtag
+	dev-libs/icu:=
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-util/gperf
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+RDEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable test tests) \
+		$(use_with tools)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libmspub/Manifest b/app-text/libmspub/Manifest
index 19b6bc8edf65..b754fe4b9575 100644
--- a/app-text/libmspub/Manifest
+++ b/app-text/libmspub/Manifest
@@ -1,4 +1,6 @@
 DIST libmspub-0.1.2.tar.xz 345556 BLAKE2B a3b47fb188fc859abf54e3375514d31a1fafa21fb57fe0ac4a20013741a223a7011adf8ce7784b61346b49e9f4c0b6c353138dc12a5035f7bcc24576a508aa50 SHA512 c19025a2b887c33f5966b0972204ab2a8ae841b82df38eaf53c0cdc8f99d93cccab5e1c78143a79d5aef9c7a7387bd6f2cf34833a00861058e0e4687f48be714
+DIST libmspub-0.1.3.tar.xz 377716 BLAKE2B 6b6592f92523d009b1e6c8b1d24ae2efd36efd692cde53e221fcd701aca3246004d20aa8d584271ef6c75add4251e62c93c5a2896d1d3cc5e65f8389dc88ae65 SHA512 3d3680a732c84f7817cf079ae458f56e1eac14663014d48c29f54a6b4dfee887c2cc296a6d6e00d2e05329126414e6513cd7d1187c760ce952c72c27a7ccda46
 EBUILD libmspub-0.1.2.ebuild 1104 BLAKE2B a1e08c89ea9985c4c87f36ad72ee87a3fdf5eee3b1196a0341075e983bb705ea43f9463108a190998e497f39f39a5dca6ae28628721025d233639e2cec66f4f3 SHA512 2b51600c91a38352d73d98571327f42f4a23213a5588e8e465162cf80fad926c6062964d76cfc2ef9b6f9e496ddfab157e29293ec5de9aff641b732c21fe16c5
-EBUILD libmspub-9999.ebuild 1081 BLAKE2B ae9db6180bccf4bfff557b9952c0ba34b4bd5b65b2fa95b68bb2a1bef7e0df940e0676bf745e0339ebc46f8690b9ff8e349c6fa4a3d5b7821ecbd3dc0fadf872 SHA512 f9628d9dfef0f93360ce7b7fa39894a272627ca3e00c382fa8bda258591fc56759505eed49a1fb77d8b8361b5a935ac12db7cda53d75a0222a66e914d15629e3
+EBUILD libmspub-0.1.3.ebuild 1106 BLAKE2B 469d12b4da818c67202e51be97e60d6d88b71ef409188dded463afd02aa09e8aaa8f7d267943cafdacdd084e9a369c758d81c54076db25cb16d71fdee4b8e9bd SHA512 87bb587cf932a6e7913e665d26702d7c4c98c1bd866034cefc24a95be30afba5bb6b34df1803d5c7995c4f6dbd1f39259e10f9caf517e22d2f05fcd5bcfe1805
+EBUILD libmspub-9999.ebuild 1106 BLAKE2B 469d12b4da818c67202e51be97e60d6d88b71ef409188dded463afd02aa09e8aaa8f7d267943cafdacdd084e9a369c758d81c54076db25cb16d71fdee4b8e9bd SHA512 87bb587cf932a6e7913e665d26702d7c4c98c1bd866034cefc24a95be30afba5bb6b34df1803d5c7995c4f6dbd1f39259e10f9caf517e22d2f05fcd5bcfe1805
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libmspub/libmspub-0.1.3.ebuild b/app-text/libmspub/libmspub-0.1.3.ebuild
new file mode 100644
index 000000000000..221a09a70251
--- /dev/null
+++ b/app-text/libmspub/libmspub-0.1.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git"
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
+
+DESCRIPTION="Library parsing Microsoft Publisher documents"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
+[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+IUSE="doc static-libs"
+
+RDEPEND="
+	dev-libs/icu:=
+	dev-libs/librevenge
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	default
+	[[ -d m4 ]] || mkdir "m4"
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libmspub/libmspub-9999.ebuild b/app-text/libmspub/libmspub-9999.ebuild
index 83a7b70ff42b..221a09a70251 100644
--- a/app-text/libmspub/libmspub-9999.ebuild
+++ b/app-text/libmspub/libmspub-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SLOT="0"
 
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 
 IUSE="doc static-libs"
 
diff --git a/app-text/libqxp/Manifest b/app-text/libqxp/Manifest
index 8ba4acb4255e..7f1bffb854ff 100644
--- a/app-text/libqxp/Manifest
+++ b/app-text/libqxp/Manifest
@@ -1,3 +1,5 @@
 DIST libqxp-0.0.0.tar.xz 337292 BLAKE2B 16b59353f35d8a93d57600e0ad185755f5f072b41568886197684f65d9f10042e376ae3683f229ba9e526cc8af81b1c1c423defa00eccb3448611765eed7dbf6 SHA512 c92cb6298ea4643e29145732ff3b6df806f2d30c86ab4967e445dcbc8c43b6d9fdd17c30a3e6131b4f0f2a42135caa0137b61aac2ab2722528a08e1fd6c02df9
+DIST libqxp-0.0.1.tar.xz 340184 BLAKE2B 759e5d0fb5886485f4ebe4a6caa34d1d98dc623c0ae124c6666a1be5ce7fb73686fc83360712d59d020e4788b39aa57d32149b7641d71b73dde917df46617f17 SHA512 a03a9ada658a92f4d985cad91d467b3916334c74dc26c1e4de89e3929e0135ca0e9c7e7e18ce616ef56a67863ec19c2638494400785849017f9a4776df07c607
 EBUILD libqxp-0.0.0.ebuild 729 BLAKE2B cee28b3178da4ce7c6af4f2c6e068ad8639369d25e42d211b5d06886362e16e657a46aeea617286e7c56759a68624d7b742340b36109c2d92c589aa49bb6788f SHA512 d53e5c523bbc5fd08f428fe65a6a6b099588a5cff60399bee9718378e82038a0b167cbb084ae097faf373a50f6ffffe4bb73015a9002b00dab01f18054c67ac5
+EBUILD libqxp-0.0.1.ebuild 729 BLAKE2B 9622c30476ab4f488ace1ab438c287feaf133ba24e393713727b49f5d4a9bddcbbb86b3df590b27e0b9fce35ab664dccd775ee9172e962585555df175dc85d75 SHA512 f3f4acd7a71093f0f9e355f664e9d6b292401af486e4f62a24e00f7ec471d8b776d914134bce1907e6dfd000ba499cb6c95a40f06f2734095a75a5c53581c60d
 MISC metadata.xml 326 BLAKE2B 2058d5aa3fb12800596e894b6415bbb01df4d3b72efd60cb7cfc26d75f60d1de9ac3190aa4e82145fcfffbd3a48a80f8f2d0f984662160b82c6201aac48e3261 SHA512 97b3e21efde5b88155863552b56e196d2349d761106177deb84e587d3bd0c08cf4e91ec779caf1db86970ddd3f6ce7ce76ded2e08a8a763e93428a9042605e6e
diff --git a/app-text/libqxp/libqxp-0.0.1.ebuild b/app-text/libqxp/libqxp-0.0.1.ebuild
new file mode 100644
index 000000000000..7658d115ca4c
--- /dev/null
+++ b/app-text/libqxp/libqxp-0.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Library parsing QuarkXpress documents"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
+SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc test tools"
+
+RDEPEND="
+	dev-libs/librevenge
+	dev-libs/icu:=
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	econf \
+		--disable-weffc \
+		$(use_enable debug) \
+		$(use_with doc docs) \
+		$(use_enable test tests) \
+		$(use_enable tools)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index c9f2a052e1bd..6372e25a72b1 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -22,6 +22,6 @@ DIST poppler-0.61.1.tar.xz 1433696 BLAKE2B 6749466223d3bb0e891c6b26c7f1faa5c774d
 DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac SHA512 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706
 EBUILD poppler-0.57.0-r1.ebuild 4348 BLAKE2B 066b4f63c5347e883078bd8c7af3c345d0962dd12b824d53cb1024b4f40671141436bf4992774a0c1b6f18867c57b4bc88e007ad9d7370b3349dc2b9c8640bc0 SHA512 a93fb043158a88df8f52ef3f426dcc88645b5e9c3dacd5eef7939ab1ee0d016546c04c5508596162326765b3bad07579259bb6985cd33cd1695329dbecf69484
 EBUILD poppler-0.61.1.ebuild 3868 BLAKE2B ef755c13d074fcc01a826460fc1edca0574a28c980c3c7703c44a25b0300effeb221209f8b34a19854ea39786626e244d39223b8cce416dd2b4a0021ba52675d SHA512 8dbc4c7892553589e55515622cbad3abb9b8b1933c41a9c4e54cd1dc9ce2ea0bd0e1fce97e7e00ea17a4862bdb55ef0d030b23f35d8ed2af1cde7ad6be1084a1
-EBUILD poppler-0.62.0.ebuild 3515 BLAKE2B b983164b3feea275655e71d4036b1957548589bac7a7cb5fa20ec1a25ddd6b8663f496f5a4a35b0253225cd52cd75d6a97842511a2bb81c2f772d572d5babc2e SHA512 391d176942fda9bfbdbb334a93748c5010623acfa1a9cf51ab50b9b9e7cc0bb642c04b3146569247600f6d551ea5babb66e2d7764f64b7317ded5f8442db4d4b
+EBUILD poppler-0.62.0-r1.ebuild 3515 BLAKE2B 775e584508e001165e54cc7190c01755c4ffe09f92db52f98e8811daab0e74e6b353f223ebf7d65629e36b7dbeb0d755d1ec08af9d558b7607597bc0d6648fa5 SHA512 8e202e9810d5e944a35ddb70ca82b9319eb90dc5208b24848b5ff8da4d51654bdba42aa25f286cf0b90bf292547a99bca8df01440cd0a3a47719df0369146c29
 EBUILD poppler-9999.ebuild 3529 BLAKE2B 6d9fc0cebe9e50d42863645b8337347d9a30b17bdc959ff85d67c667f35626457b77e615bcb89c4d64d66de4ca127f32695d0a429370efaea4d9a92cc0fb0bdf SHA512 6e78f889d20409846cccfd6ab51f4a76b122f1932326347d9b80dac1abaf58fc16401d2805366613a24809f840c764cddde06fa30ac156d765e5003fd11f2e50
 MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
diff --git a/app-text/poppler/poppler-0.62.0.ebuild b/app-text/poppler/poppler-0.62.0-r1.ebuild
index 9934ad402fa5..b582e20f1f79 100644
--- a/app-text/poppler/poppler-0.62.0.ebuild
+++ b/app-text/poppler/poppler-0.62.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/72"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/73"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index 099344d3c65b..0ad0ef617608 100644
--- a/app-text/t1utils/Manifest
+++ b/app-text/t1utils/Manifest
@@ -1,7 +1,9 @@
+AUX t1utils-1.41-memmem.patch 703 BLAKE2B 3d7801d11e9120701c3229bb495d5cbef8b538a1486bcbe40039b2915af9ed11c444f20914d8e678af4a8beb9db999052c53d7bb04ea912f0c665871ec7848fb SHA512 ab7a8f5273aaf478c4e2fd9aa201d5b081adfa431e147ccd429ca5eaefca1858008e09dbe62d7847ae3fe307d5b1f72a16093d026f7d73f665531abde5f5c60b
 DIST t1utils-1.39.tar.gz 175047 BLAKE2B 346c6a400351e3662cb7ab88183c2f3b3934d4dd124742c06513c0d582d1359803fb32272ebb6744a227e1a862e7c55f195273087c8cc401a8bdf507227b967d SHA512 930fa0f264136fdc5d3d18e9a3b45c4818413d01ed12a32daa1b5ecfcc0ea4d6554faf428c6bab9247a2cfc16973787c0b6f0dfbb0273fa6a03a3e8d1d501301
 DIST t1utils-1.40.tar.gz 176192 BLAKE2B fedad4e273c7994f9de5d8a9f88cdaf305608807a18bf7db4cd61ddee3194ee7829c829f4608ee87d7068a627fbdab116a61bef4ed1918ab9e71516f210e4293 SHA512 790a6196b9dedd7ff7b25b7933678190d6380a341d543ca9064372c2c1c8eb8114a054dadd67f7f198084f1d7ed2cc10d78a6dbee6805b8e614328e0809a1807
 DIST t1utils-1.41.tar.gz 176552 BLAKE2B 69ccc07a3b98de18355b09532129f80e4188d64817a1ad4e8439b3a0e37917a63b9e187a25fedfc5aba486b2e60279586a425992e9f25a111ba9c77ed3863f6e SHA512 b532d3af38a73903a512eb1297ba7510747dcbe8362acc4a0f20f2a3c786d82d8f5b22997ed3867114f33153a34cdd71c4c8e6a093db3cecc3825b6e4725a00b
 EBUILD t1utils-1.39.ebuild 636 BLAKE2B c93d88c0135586cf5f5cb1d77cb36d5e06a187a1e064bd4c3010129fb25afab10508d49c3e49f401b88e3e69992586b117a9fcb31aeb9d0c75dd7adf54ef471c SHA512 4c4e285265f05720bafeb2c6a272b55936ed7589cb41f463962fafb70b8bc7be9e1d1e6a8664ee14f5fd49c1ac05f64977d5472394c8b56e48a43538d7f9bf59
 EBUILD t1utils-1.40.ebuild 645 BLAKE2B 8cd9db742a2692897bd5c5f4a8009f46717c8dec9531aa951fcdb66e07e9c072c5617d13af1915c4e9c5543a09acac2c70e178e04a6cdb821e3ef38ad41a1d27 SHA512 6bfefc1d614f986f5b5bd0c3c731fff40dc6549254a213a72fde184113653998757a0bbc33bf09011892fc6ca50632839d9332952cb13e4c03613f0122c9190c
 EBUILD t1utils-1.41-r1.ebuild 582 BLAKE2B 42785ac05287fd06f1656f0f92e3b0ba85c4ef25302581b6b736b935db13a3f1bf2324a222e730c4fa5ecffd56a8302d2a335159dfe0478dc3adcd1b51f71f96 SHA512 ec09c0b28ff09f1add4d9436df2c3fe293980ade630d31e58a0831140cc2ec68268ce59e1d4c7cb81e288420e42a2620154516783b456b55f8b072365334be18
+EBUILD t1utils-1.41-r2.ebuild 687 BLAKE2B 2758b3ee7c62fa6b6e9db3b1fcae9aa432ecb06f0ae701f5ef52de545fe6a426da68e611ae0e47217b7a6b6bef662ee9d471ac6ab91c2bf8722f76627b30f1af SHA512 34328663ef83080d489b5731909aebd3e5406077170e4a6fc0a75c8f3a1f1a2ad79e0a70339cf8ad7b83239092a1af458a8b6b18f07d0d3a11cc3e3fc5559f44
 MISC metadata.xml 347 BLAKE2B 2f19fa13fe0a6a3f521653e00c787e1e5b61a0d53ef30e06efb6ef104d560e90417512d9e72bed79f51a81bd465494ac469f23246705876cfb91da82fe31cddb SHA512 6a4884011de9218a6c0417b64690cc76c9c5be7a525f4439fb04e70c3ed287080fdb5707004d611107dee69230bb1f892078260bd18dfe7aa824d88e23dffc16
diff --git a/app-text/t1utils/files/t1utils-1.41-memmem.patch b/app-text/t1utils/files/t1utils-1.41-memmem.patch
new file mode 100644
index 000000000000..db6f19549e5e
--- /dev/null
+++ b/app-text/t1utils/files/t1utils-1.41-memmem.patch
@@ -0,0 +1,27 @@
+commit 3f1ddda424353f0f926dd28efa47b0ac61556ce8
+Author: Eddie Kohler <ekohler@gmail.com>
+Date:   Wed Aug 16 12:37:34 2017 -0400
+
+    Check for memmem declaration; sometimes it is not declared by default.
+
+diff --git a/configure.ac b/configure.ac
+index 5b4e3ff..b4dc4fb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,6 +19,7 @@ dnl strerror()?
+ dnl
+ 
+ AC_REPLACE_FUNCS([strerror memmem])
++AC_CHECK_DECLS([memmem])
+ 
+ 
+ dnl
+@@ -88,7 +89,7 @@ char* strerror(int errno);
+ #endif
+ 
+ /* Prototype memmem if we don't have it. */
+-#if !HAVE_MEMMEM
++#if !HAVE_MEMMEM || !HAVE_DECL_MEMMEM
+ void* memmem(const void* haystack, size_t haystack_len,
+              const void* needle, size_t needle_len);
+ #endif
diff --git a/app-text/t1utils/t1utils-1.41-r2.ebuild b/app-text/t1utils/t1utils-1.41-r2.ebuild
new file mode 100644
index 000000000000..8148e274d981
--- /dev/null
+++ b/app-text/t1utils/t1utils-1.41-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Type 1 Font utilities"
+SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
+HOMEPAGE="http://www.lcdf.org/type/#t1utils"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+LICENSE="BSD"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	!<media-libs/freetype-1.4_pre20080316"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-memmem.patch
+)
+DOCS=( NEWS.md README.md )
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index dd91ba08d21b..c4bc3799f3a8 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -10,8 +10,10 @@ DIST texlive-core-patches-48.tar.xz 3528 BLAKE2B 6f6fbb5c4c9add39957a98de3913b97
 DIST texlive-core-patches-49.tar.xz 2796 BLAKE2B ed35c494ab5d97f5e44d19348de477c724a0209442a7267bd1bab4e6b3b140808d4a41c6320c64ef2db31c04bd2b31485c3b34c1a5623f8793420b6c6f46b1c4 SHA512 4faf0b9653b9a5335e4b210d15200b4118245687ff12e617f181bdece5d2b5cd827247fc72bdc304722f72d8f017804b8026300a9be18f7663749ddc82c7bb17
 DIST texlive-core-patches-50.tar.xz 4632 BLAKE2B 8b5c5d46e820a568b0e47ba62d0e8c2cc874f2b2bebc8eb791470568659ff6e4115b65eea25eaad08923dfc4cd5e5808fe09289a58bd771f7211beef8b627dbe SHA512 f8fab7940b417b7065c9c467f7a9612e161a1a44db50a4523ee4a092ba381f7580adf1c3d75375165795dfc3f23d005028d67351815481dbdbd6edb13f376b64
 DIST texlive-core-patches-52.tar.xz 3376 BLAKE2B 57cea2599e4c59e0dd7dc8b078b79e8b3ad4b310fd7d7749c39c9fecec872307ca5d3e0ec826b8c63bc050ac0eb195b2c2bc2a2b514e0db7f4ac02cdf3df1c80 SHA512 fbc84217911d797373ad03e3da3bcb2277d74edf3a9fd77a5bf67bed7fb207d1cd3d9c9c7947c906ee10989fe6ceb6c263a4002a592217bce7e873db813dc367
+DIST texlive-core-patches-65.1.tar.xz 12080 BLAKE2B b6a51d733198e42c06bc896bb55786166b9b034ae3025c3a9a5c3e81e3aafac4732515088248c0e195bf0b9fb88e67b2a0d4a94e4173aecdaf307fedb0d269d9 SHA512 fa4de81cb694050728146ad7ca9a2a0247af7b1aef16efcfccebf9d0beac11ddcc334f333e1e1267658743b16b666a285dab902c3e75aa3b21c60946a82871f5
 DIST texlive-core-patches-65.tar.xz 4108 BLAKE2B da1f7f870c56fa7bf21186f6acdd495c0e1314e92fee9d546e3ef502307e68fc4482c362edd3bfa73aa9d0faec5363f90c2b2dd1ddefd2fc9085a046bfd6eefb SHA512 71ec54cce052ed60bd0d3c836901d5b2fdc8ab6190536056d617652953009b4645896e7d22ccb9d4ebf177aaefcdca30269600e0cb16daa8d395b036c679971c
 DIST texlive-core-patches-68.tar.xz 5140 BLAKE2B 830a8da64151169cb68e55daaf8c3843980a9dcb85120862d0dec31a42508ff7eec24df1f2069a96a5a4ae7e9b8011ffdb50548f5f6ae722a23132624a77ea22 SHA512 225e7019c132b7e8185343c409cc2b6f418cb062127e916aa3b70db0c6f19d7957415056f2b526f1ea7b7ad13d4367822f34bb710f85ab7cc6bc757b21871d20
+DIST texlive-core-patches-70.tar.xz 13068 BLAKE2B 011cf51af10d28ac9df7c9b9d7aea2cac3e562d393dcf09d57b3c2832fe6816cf926458417577f7c9d9414639a291c09240444145bdbb3d132170f51a8a16980 SHA512 fd26b92a03cd0446007728d0c16a8c7301e254515b997e6a0bd9b325db162bf3f2a2e96be0cb185f042038205c4b4dacf1785a216c8326328682f1c42da9079e
 DIST texlive-module-a2ping-2012.tar.xz 31124 BLAKE2B 5f9a4a7dba307c490c753296eecfce28811be14dfb13c2d4f81024d16d837a8dbe8af4c49902ab8cb977af5a6df6f18f707778445e6650f335fccd6fa33da8bb SHA512 b4f74f037d1113d204d3f0e34c8418e354ae002ab09e8c326458bf7c9c9a9bfa3211317e03bb7e69d7f2e83a2b22851410287477176dab5288dacf5a9ec4a8a6
 DIST texlive-module-a2ping-2013.tar.xz 31124 BLAKE2B 9f90c5429911b2ef3f462951f745144ae82790089aebcba3de7c9c219cf360143d37c836ce6027f2618bf258aa656bc7757d0c7c52a8b51583cf9a326aa18e19 SHA512 bc05c8610e58bacb6001fd41f848d12f8e77837b5e24d32f7af1c9939778d92aeac7ee07969f22e86c72a8850650ad1d06341681503d8d8699dbf6db1de4be62
 DIST texlive-module-a2ping-2014.tar.xz 31124 BLAKE2B c7bc4b68565703f0844291377cb771caa3cc18bc0e438f70a49511822c75cb09095ea534a671b2b27399acd87adc84c112639e4605d5ce282eef2dbd0b4b93e0 SHA512 d5b65f04a96b7206624fd80fae4a04779fd31995247ed4b04d3ddb7197aeb3373d6b3679f674e29fb39e7022f37115fab2a3f5fc7304b3c6c133456242fef8bb
@@ -784,5 +786,7 @@ EBUILD texlive-core-2013-r3.ebuild 11429 BLAKE2B 4acb2e48b6400c1fda6ded3b4e098f2
 EBUILD texlive-core-2014-r4.ebuild 10720 BLAKE2B 2887ea23e06a64622722b5857fd68355decfc87ebc2a272991653b690b337368f69106354739f8137620126db522795b016926e220d2bd2cad8d34387a9f5060 SHA512 efa6656f4242526b174c43eb4349ae2339c9f2f59e68190ac87dba6337b4750fc0404140e5c6df3f61a1cd96ee4a6b48279d3c8e8ae7fbd828264b191d7115f3
 EBUILD texlive-core-2015-r1.ebuild 10925 BLAKE2B 85715b6526c34cb996854834f70687c8602212e6adf6f8b88c040ffea1f667355b6249c624fadfcbd5f2d63691d9e97bc140f347997b618bad10ed39ee02aa13 SHA512 409576c65f51cc4b824c3a98d2b34273c4163b8aee3de426b0b38bde573b4dc4e08c36225aaab15b550842d86778d63780ece0d55fed0fb7070dc1d28d3026ad
 EBUILD texlive-core-2016-r5.ebuild 11555 BLAKE2B a518636f0d5ab05d7e76a5200e2ba94bb8a0c8d76c37193b31789c8176b32bb2142cf5616c5a278732c110914be82636f0598e3e4c9234187d38f049f4cc68e6 SHA512 8d17485bea8ed2f0da0b5a3443c38f8e1d78daba639033042464c609432f42a574264920b673e732193efc6a9522c015c8ca9a1529577b5c6a01551a39864237
+EBUILD texlive-core-2016-r6.ebuild 11566 BLAKE2B 6ee8433c05ac9d7175df9c255a1b2d5deda4338e36cc5464a9ec229ec277ee8f4ae375eb669af0991b7f814b57d878443f365a74f598b80b344405fc51c87d4b SHA512 2549c0716d265749e2e64e822d88cc05cf52680170e7155acdc7d3653bbbe734dbcef7d44391986ec61129d7fe224a480d2df01aabde8d232534cad05e5e9d23
 EBUILD texlive-core-2017-r2.ebuild 11637 BLAKE2B d2b7e0b062a14232492e21e7a7c2d747e054888091da79786d03898d7ab0eda2410ffe9fc9533c79b844c1ec4dd96cc8ac8610ad3428a9e16d1bcaff8421ac15 SHA512 2298ae898b67362cc5bb3c56bec13f105f0124980e26da8aaaca2ffc21edc04eac6cf7a755f1867f85835a98c00865656f9b97e741bea8dec22aac841e2e727c
+EBUILD texlive-core-2017-r3.ebuild 11611 BLAKE2B d948e66e0e764a6378fea7a36f861379c139b2ef911786f52cc21655eeb2d83ae713a1e4e9fe3d455a9ad16115388269e901b932f4c60fce40319f2baab6da4a SHA512 d6c41eb28d8c26cd0290477c1b4e6b23a35f34bc3bfdb1f1f4db90000d0acd26e29fb0c627a7b6244ecc1f4852ba4eb4104948e92cfc3311ccfcf8826680ce21
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2016-r6.ebuild b/app-text/texlive-core/texlive-core-2016-r6.ebuild
new file mode 100644
index 000000000000..c9a538691161
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2016-r6.ebuild
@@ -0,0 +1,356 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+PATCHLEVEL="65.1"
+TL_SOURCE_VERSION=20160523
+
+inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
+
+# Fetch patches
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
+#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
+
+TL_CORE_BINEXTRA_MODULES="
+	a2ping adhocfilelist arara asymptote bundledoc checklistings ctan_chk
+	ctanify ctanupload ctie cweb de-macro dtl dtxgen dvi2tty dviasm dvicopy
+	dvidvi dviljk dvipos findhyph fragmaster hook-pre-commit-pkg hyphenex
+	installfont lacheck latex-git-log latex-papersize latex2man latex2nemeth
+	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext make4ht
+	match_parens mflua mkjobtexmf patgen pdfbook2 pdfcrop pdflatexpicscale pdftools
+	pdfxup pfarrei pkfix pkfix-helper purifyeps seetexk srcredact sty2dtx
+	synctex tex4ebook texcount texdef texdiff texdirflatten texdoc texfot
+	texliveonfly texloganalyser texosquery texware tie tpic2pdftex typeoutfileinfo
+	web collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc adhocfilelist.doc arara.doc asymptote.doc bundledoc.doc
+	checklistings.doc ctan_chk.doc ctanify.doc ctanupload.doc ctie.doc
+	cweb.doc de-macro.doc dtl.doc dtxgen.doc dvi2tty.doc dviasm.doc dvicopy.doc
+	dvidvi.doc dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
+	hook-pre-commit-pkg.doc installfont.doc lacheck.doc latex-git-log.doc
+	latex-papersize.doc latex2man.doc latex2nemeth.doc latexfileversion.doc
+	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
+	make4ht.doc match_parens.doc mkjobtexmf.doc patgen.doc pdfbook2.doc pdfcrop.doc
+	pdflatexpicscale.doc pdftools.doc pdfxup.doc pfarrei.doc pkfix.doc
+	pkfix-helper.doc purifyeps.doc pythontex.doc seetexk.doc srcredact.doc
+	sty2dtx.doc synctex.doc tex4ebook.doc texcount.doc texdef.doc texdiff.doc
+	texdirflatten.doc texdoc.doc texfot.doc texliveonfly.doc texloganalyser.doc
+	texosquery.doc texware.doc tie.doc tpic2pdftex.doc typeoutfileinfo.doc web.doc
+"
+TL_CORE_BINEXTRA_SRC_MODULES="
+	adhocfilelist.source arara.source checklistings.source hyphenex.source
+	listings-ext.source mkjobtexmf.source pfarrei.source pythontex.source
+	texdef.source texosquery.source
+"
+
+TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cjk X doc source tk +luajittex xetex"
+
+TEXMF_PATH=/usr/share/texmf-dist
+
+MODULAR_X_DEPEND="X? (
+				x11-libs/libXmu
+				x11-libs/libXp
+				x11-libs/libXpm
+				x11-libs/libXaw
+	)"
+
+COMMON_DEPEND="${MODULAR_X_DEPEND}
+	!app-text/ptex
+	!app-text/tetex
+	!<app-text/texlive-2007
+	!app-text/xetex
+	!<dev-texlive/texlive-basic-2014
+	!<dev-texlive/texlive-metapost-2011
+	!app-text/dvibook
+	!dev-tex/luatex
+	!app-text/dvipdfm
+	!app-text/dvipdfmx
+	!app-text/xdvipdfmx
+	sys-libs/zlib
+	>=media-libs/libpng-1.2.43-r2:0=
+	>=app-text/poppler-0.12.3-r3:=
+	>=x11-libs/cairo-1.12
+	>=x11-libs/pixman-0.18
+	dev-libs/zziplib
+	app-text/libpaper
+	dev-libs/gmp:0
+	dev-libs/mpfr:0
+	xetex? (
+		>=media-libs/harfbuzz-0.9.20[icu,graphite]
+		>=dev-libs/icu-50:=
+		>=app-text/teckit-2.5.3
+		media-libs/fontconfig
+		media-gfx/graphite2
+	)
+	media-libs/freetype:2
+	>=dev-libs/kpathsea-6.2.1
+	cjk? ( >=dev-libs/ptexenc-1.3.4_p20160523 )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-apps/ed
+	sys-devel/flex
+	app-arch/xz-utils"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ps2pkm-1.8_p20160523
+	>=app-text/dvipsk-5.996_p20160523
+	>=dev-tex/bibtexu-3.71_p20160523
+	virtual/perl-Getopt-Long
+	tk? ( dev-perl/Tk )"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die "failed to create build dir"
+}
+
+RELOC_TARGET=texmf-dist
+
+src_prepare() {
+	cd "${WORKDIR}"
+	# From texlive-module.eclass.
+	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
+	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
+	for i in $(<"${T}/dirlist"); do
+		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
+	done
+	for i in $(<"${T}/reloclist"); do
+		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
+	done
+
+	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+	cd "${B}"
+	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	sed -i \
+		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
+		texk/web2c/configure || die
+
+	elibtoolize
+}
+
+src_configure() {
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Required for newest icu, bug #618732
+	append-cxxflags '-std=c++11'
+
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #242430
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+	tc-export CC CXX AR RANLIB
+	ECONF_SOURCE="${B}" \
+		econf -C \
+		--bindir="${EPREFIX}"/usr/bin \
+		--datadir="${S}" \
+		--with-system-freetype2 \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-xpdf \
+		--with-system-poppler \
+		--with-system-teckit \
+		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
+		--with-system-kpathsea \
+		--with-kpathsea-includes="${EPREFIX}"/usr/include \
+		--with-system-icu \
+		--with-system-ptexenc \
+		--with-system-harfbuzz \
+		--with-system-icu \
+		--with-system-graphite2 \
+		--with-system-cairo \
+		--with-system-pixman \
+		--with-system-zziplib \
+		--with-system-libpaper \
+		--with-system-gmp \
+		--with-system-mpfr \
+		--without-texinfo \
+		--disable-dialog \
+		--disable-multiplatform \
+		--enable-epsfwin \
+		--enable-mftalkwin \
+		--enable-regiswin \
+		--enable-tektronixwin \
+		--enable-unitermwin \
+		--with-ps=gs \
+		--disable-psutils \
+		--disable-t1utils \
+		--enable-ipc \
+		--disable-biber \
+		--disable-bibtex-x \
+		--disable-dvipng \
+		--disable-dvipsk \
+		--disable-chktex \
+		--disable-lcdf-typetools \
+		--disable-pdfopen \
+		--disable-ps2eps \
+		--disable-ps2pk \
+		--disable-detex \
+		--disable-ttf2pk2 \
+		--disable-tex4htk \
+		--disable-cjkutils \
+		--disable-xdvik \
+		--disable-xindy \
+		--enable-luatex \
+		--disable-dvi2tty \
+		--disable-dvisvgm \
+		--disable-vlna \
+		--enable-shared \
+		--disable-native-texlive-build \
+		--disable-largefile \
+		$(use_enable luajittex) \
+		$(use_enable luajittex mfluajit) \
+		$(use_enable xetex) \
+		$(use_enable cjk ptex) \
+		$(use_enable cjk eptex) \
+		$(use_enable cjk uptex) \
+		$(use_enable cjk euptex) \
+		$(use_enable cjk mendexk) \
+		$(use_enable cjk makejvf) \
+		$(use_enable cjk pmp) \
+		$(use_enable cjk upmp) \
+		$(use_enable tk texdoctk) \
+		$(use_with X x)
+}
+
+src_compile() {
+	tc-export CC CXX AR RANLIB
+	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
+
+	cd "${B}" || die
+	# Mimic updmap --syncwithtrees to enable only fonts installed
+	# Code copied from updmap script
+	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
+		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
+	done > "${T}/updmap_update"
+	{
+		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+	} > "${T}/updmap_update2"
+	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
+		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
+}
+
+src_install() {
+	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
+	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
+
+	cd "${B}" || die
+	dodir /usr/share # just in case
+	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+
+	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
+	# exist. Instead, it is called mf, so we symlink it to please everything.
+	use X || dosym mf /usr/bin/mf-nowin
+
+	docinto texk
+	cd "${B}/texk"
+	dodoc ChangeLog README
+
+	docinto dviljk
+	cd "${B}/texk/dviljk"
+	dodoc ChangeLog README NEWS
+
+	docinto makeindexk
+	cd "${B}/texk/makeindexk"
+	dodoc ChangeLog NOTES README
+
+	docinto web2c
+	cd "${B}/texk/web2c"
+	dodoc ChangeLog NEWS PROJECTS README
+
+	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
+	# populate /etc/texmf
+	keepdir /etc/texmf/web2c
+
+	# take care of updmap.cfg and language.d files
+	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
+	# Remove bundled and invalid updmap.cfg
+	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
+
+	texlive-common_handle_config_files
+
+	keepdir /usr/share/texmf-site
+
+	# the virtex symlink is not installed
+	# The links has to be relative, since the targets
+	# is not present at this stage and MacOS doesn't
+	# like non-existing targets
+	dosym tex /usr/bin/virtex
+	dosym pdftex /usr/bin/pdfvirtex
+
+	# Rename mpost to leave room for mplib
+	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
+	dosym "mpost-${P}" /usr/bin/mpost
+
+	# Ditto for pdftex
+	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
+	dosym "pdftex-${P}" /usr/bin/pdftex
+}
+
+pkg_postinst() {
+	etexmf-update
+
+	elog
+	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
+	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
+	elog
+	ewarn "If you are migrating from an older TeX distribution"
+	ewarn "Please make sure you have read:"
+	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
+	ewarn "in order to avoid possible problems"
+	elog
+	elog "TeXLive has been split in various ebuilds. If you are missing a"
+	elog "package to process your TeX documents, you can install"
+	elog "dev-tex/texmfind to easily search for them."
+	elog
+}
diff --git a/app-text/texlive-core/texlive-core-2017-r3.ebuild b/app-text/texlive-core/texlive-core-2017-r3.ebuild
new file mode 100644
index 000000000000..c903c3f605d2
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2017-r3.ebuild
@@ -0,0 +1,359 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+PATCHLEVEL="70"
+TL_SOURCE_VERSION=20170524
+
+inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
+
+# Fetch patches
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
+#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
+
+TL_CORE_BINEXTRA_MODULES="
+	a2ping adhocfilelist arara asymptote bundledoc checklistings ctan_chk
+	ctanify ctanupload ctie cweb de-macro dtl dtxgen dvi2tty dviasm dvicopy
+	dvidvi dviljk dvipos findhyph fragmaster hook-pre-commit-pkg hyphenex
+	installfont lacheck latex-git-log latex-papersize latex2man latex2nemeth
+	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext make4ht
+	match_parens mflua mkjobtexmf patgen pdfbook2 pdfcrop pdflatexpicscale pdftools
+	pdfxup pfarrei pkfix pkfix-helper purifyeps seetexk srcredact sty2dtx
+	synctex tex4ebook texcount texdef texdiff texdirflatten texdoc texfot
+	texliveonfly texloganalyser texosquery texware tie tpic2pdftex typeoutfileinfo
+	web collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc adhocfilelist.doc arara.doc asymptote.doc bundledoc.doc
+	checklistings.doc ctan_chk.doc ctanify.doc ctanupload.doc ctie.doc
+	cweb.doc de-macro.doc dtl.doc dtxgen.doc dvi2tty.doc dviasm.doc dvicopy.doc
+	dvidvi.doc dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
+	hook-pre-commit-pkg.doc installfont.doc lacheck.doc latex-git-log.doc
+	latex-papersize.doc latex2man.doc latex2nemeth.doc latexfileversion.doc
+	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
+	make4ht.doc match_parens.doc mkjobtexmf.doc patgen.doc pdfbook2.doc pdfcrop.doc
+	pdflatexpicscale.doc pdftools.doc pdfxup.doc pfarrei.doc pkfix.doc
+	pkfix-helper.doc purifyeps.doc pythontex.doc seetexk.doc srcredact.doc
+	sty2dtx.doc synctex.doc tex4ebook.doc texcount.doc texdef.doc texdiff.doc
+	texdirflatten.doc texdoc.doc texfot.doc texliveonfly.doc texloganalyser.doc
+	texosquery.doc texware.doc tie.doc tpic2pdftex.doc typeoutfileinfo.doc web.doc
+"
+TL_CORE_BINEXTRA_SRC_MODULES="
+	adhocfilelist.source arara.source checklistings.source hyphenex.source
+	listings-ext.source mkjobtexmf.source pfarrei.source pythontex.source
+	texdef.source texosquery.source
+"
+
+TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cjk X doc source tk +luajittex xetex"
+
+TEXMF_PATH=/usr/share/texmf-dist
+
+MODULAR_X_DEPEND="X? (
+				x11-libs/libXmu
+				x11-libs/libXp
+				x11-libs/libXpm
+				x11-libs/libXaw
+	)"
+
+COMMON_DEPEND="${MODULAR_X_DEPEND}
+	!app-text/ptex
+	!app-text/tetex
+	!<app-text/texlive-2007
+	!app-text/xetex
+	!<dev-texlive/texlive-basic-2014
+	!<dev-texlive/texlive-metapost-2011
+	!app-text/dvibook
+	!dev-tex/luatex
+	!app-text/dvipdfm
+	!app-text/dvipdfmx
+	!app-text/xdvipdfmx
+	sys-libs/zlib
+	>=media-libs/libpng-1.2.43-r2:0=
+	>=app-text/poppler-0.12.3-r3:=
+	>=x11-libs/cairo-1.12
+	>=x11-libs/pixman-0.18
+	dev-libs/zziplib
+	app-text/libpaper
+	dev-libs/gmp:0
+	dev-libs/mpfr:0=
+	xetex? (
+		>=media-libs/harfbuzz-1.4.5[icu,graphite]
+		>=dev-libs/icu-50:=
+		>=app-text/teckit-2.5.3
+		media-libs/fontconfig
+		media-gfx/graphite2
+	)
+	media-libs/freetype:2
+	>=dev-libs/kpathsea-6.2.3
+	cjk? ( >=dev-libs/ptexenc-1.3.5 )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-apps/ed
+	sys-devel/flex
+	app-arch/xz-utils"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ps2pkm-1.8_p20170524
+	>=app-text/dvipsk-5.997
+	>=dev-tex/bibtexu-3.71_p20170524
+	virtual/perl-Getopt-Long
+	tk? ( dev-perl/Tk )"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die "failed to create build dir"
+}
+
+RELOC_TARGET=texmf-dist
+
+src_prepare() {
+	cd "${WORKDIR}"
+	# From texlive-module.eclass.
+	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
+	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
+	for i in $(<"${T}/dirlist"); do
+		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
+	done
+	for i in $(<"${T}/reloclist"); do
+		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
+	done
+
+	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+	cd "${B}"
+	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	sed -i \
+		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
+		texk/web2c/configure || die
+
+	elibtoolize
+}
+
+src_configure() {
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Required for newest icu, bug #618732
+	append-cxxflags '-std=c++11'
+
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #242430
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+	tc-export CC CXX AR RANLIB
+	ECONF_SOURCE="${B}" \
+		econf -C \
+		--bindir="${EPREFIX}"/usr/bin \
+		--datadir="${S}" \
+		--with-system-freetype2 \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-xpdf \
+		--with-system-poppler \
+		--with-system-teckit \
+		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
+		--with-system-kpathsea \
+		--with-kpathsea-includes="${EPREFIX}"/usr/include \
+		--with-system-icu \
+		--with-system-ptexenc \
+		--with-system-harfbuzz \
+		--with-system-icu \
+		--with-system-graphite2 \
+		--with-system-cairo \
+		--with-system-pixman \
+		--with-system-zziplib \
+		--with-system-libpaper \
+		--with-system-gmp \
+		--with-system-mpfr \
+		--without-texinfo \
+		--disable-dialog \
+		--disable-multiplatform \
+		--enable-epsfwin \
+		--enable-mftalkwin \
+		--enable-regiswin \
+		--enable-tektronixwin \
+		--enable-unitermwin \
+		--with-ps=gs \
+		--disable-psutils \
+		--disable-t1utils \
+		--enable-ipc \
+		--disable-biber \
+		--disable-bibtex-x \
+		--disable-dvipng \
+		--disable-dvipsk \
+		--disable-chktex \
+		--disable-lcdf-typetools \
+		--disable-pdfopen \
+		--disable-ps2eps \
+		--disable-ps2pk \
+		--disable-detex \
+		--disable-ttf2pk2 \
+		--disable-tex4htk \
+		--disable-cjkutils \
+		--disable-xdvik \
+		--disable-xindy \
+		--enable-luatex \
+		--disable-dvi2tty \
+		--disable-dvisvgm \
+		--disable-vlna \
+		--enable-shared \
+		--disable-native-texlive-build \
+		--disable-largefile \
+		$(use_enable luajittex) \
+		$(use_enable luajittex mfluajit) \
+		$(use_enable xetex) \
+		$(use_enable cjk ptex) \
+		$(use_enable cjk eptex) \
+		$(use_enable cjk uptex) \
+		$(use_enable cjk euptex) \
+		$(use_enable cjk mendexk) \
+		$(use_enable cjk makejvf) \
+		$(use_enable cjk pmp) \
+		$(use_enable cjk upmp) \
+		$(use_enable tk texdoctk) \
+		$(use_with X x)
+}
+
+src_compile() {
+	tc-export CC CXX AR RANLIB
+	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
+
+	cd "${B}" || die
+	# Mimic updmap --syncwithtrees to enable only fonts installed
+	# Code copied from updmap script
+	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
+		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
+	done > "${T}/updmap_update"
+	{
+		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+	} > "${T}/updmap_update2"
+	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
+		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
+}
+
+src_install() {
+	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
+	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
+
+	cd "${B}" || die
+	dodir /usr/share # just in case
+	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+
+	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
+	# exist. Instead, it is called mf, so we symlink it to please everything.
+	use X || dosym mf /usr/bin/mf-nowin
+
+	docinto texk
+	cd "${B}/texk"
+	dodoc ChangeLog README
+
+	docinto dviljk
+	cd "${B}/texk/dviljk"
+	dodoc ChangeLog README NEWS
+
+	docinto makeindexk
+	cd "${B}/texk/makeindexk"
+	dodoc ChangeLog NOTES README
+
+	docinto web2c
+	cd "${B}/texk/web2c"
+	dodoc ChangeLog NEWS PROJECTS README
+
+	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
+	# populate /etc/texmf
+	keepdir /etc/texmf/web2c
+
+	# take care of updmap.cfg and language.d files
+	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
+	# Remove bundled and invalid updmap.cfg
+	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
+
+	texlive-common_handle_config_files
+
+	keepdir /usr/share/texmf-site
+
+	# the virtex symlink is not installed
+	# The links has to be relative, since the targets
+	# is not present at this stage and MacOS doesn't
+	# like non-existing targets
+	dosym tex /usr/bin/virtex
+	dosym pdftex /usr/bin/pdfvirtex
+
+	# Rename mpost to leave room for mplib
+	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
+	dosym "mpost-${P}" /usr/bin/mpost
+
+	# Ditto for pdftex
+	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
+	dosym "pdftex-${P}" /usr/bin/pdftex
+}
+
+pkg_postinst() {
+	etexmf-update
+
+	einfo "Regenerating TeX formats"
+	fmtutil-sys --all &> /dev/null
+
+	elog
+	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
+	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
+	elog
+	ewarn "If you are migrating from an older TeX distribution"
+	ewarn "Please make sure you have read:"
+	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
+	ewarn "in order to avoid possible problems"
+	elog
+	elog "TeXLive has been split in various ebuilds. If you are missing a"
+	elog "package to process your TeX documents, you can install"
+	elog "dev-tex/texmfind to easily search for them."
+	elog
+}
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 0032a10b4859..2203280c7846 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/molokai/Manifest b/app-vim/molokai/Manifest
index 133dcddff64e..0eb10ccf31a8 100644
--- a/app-vim/molokai/Manifest
+++ b/app-vim/molokai/Manifest
@@ -1,3 +1,3 @@
 DIST molokai-0.1_p20151115.tar.gz 3817 BLAKE2B 595691992ab2e1820afa105ee23a123f28db7c5bca80e5b99e87b7b3b081d1d1e10f9db81686bcc98ef79042118f119b0ae191ca9e7a7b8004b95267f35dfef8 SHA512 8ba5821dfae8c723185999d038142b2061b01ec8c9c6340fd082bac0bdf78d2fcc21a8e3103f20b58bc60c38ed62966376903e85f5b9b49947d38c8c34d14908
-EBUILD molokai-0.1_p20151115.ebuild 436 BLAKE2B 3ae2ecd7e4ef98dc775f8942ba4784a1669f47d5bdc7b815852ca4ce1b912719436eac250f8eeb07c85b8845120b914cba6977a694816ef2c471e195c9f682a5 SHA512 132d5c76c23247cbdcc912f9257952450d8e436ac3a397b4eb05b312124af05421fcefab20f42e525ae695adfce08c9e5c7825825f39b35a641712853952138a
+EBUILD molokai-0.1_p20151115.ebuild 413 BLAKE2B 5612f0535876b2bb160dc63e4fd323d4ea5c804f1db8a3d9eba470e51a859ec6927a055ff0416ad1bfe623f6cb2c5e9fade311e8e77edbe9ca5f5fbb87b24194 SHA512 164b52b698b44b950402d16e401670b06c99bfe98d592cd2b03a14bbe1f686edefd53be09081477bdcb093687c2f670b5d882b5fc73de57777adfb284b4d1138
 MISC metadata.xml 328 BLAKE2B b6667a882bb103dc34b08fc6a6384f0e9264de371f5b9eeb1a62b46978e66b0821f9e461935f0b3fdaaab129c6e30c93cc8c730151dd078a9eb3d7423a9fc653 SHA512 06b187681e64b1cdea061d8a24e96cc2f55cd18ecb8dc7235a790670cb76f5a1b6cadd571bafb1c8a23ae2e9f77935972e543be6b274cc6cef148df381c84717
diff --git a/app-vim/molokai/molokai-0.1_p20151115.ebuild b/app-vim/molokai/molokai-0.1_p20151115.ebuild
index eb7b16b1b275..bd91b3a6c22c 100644
--- a/app-vim/molokai/molokai-0.1_p20151115.ebuild
+++ b/app-vim/molokai/molokai-0.1_p20151115.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit vim-plugin
+inherit vim-plugin vcs-snapshot
 
 COMMIT="c67bdfcdb31415aa0ade7f8c003261700a885476"
 
@@ -13,6 +13,4 @@ HOMEPAGE="https://github.com/tomasr/molokai"
 SRC_URI="https://github.com/tomasr/molokai/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="vim"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/molokai-${COMMIT}"
+KEYWORDS="amd64 x86"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index e51f3cbc089f..cffa1776b18b 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 3ccb1343d7f0..c9c5b6ba6373 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -2,13 +2,14 @@ DIST perl-5.24.1-patches-3.tar.xz 24012 BLAKE2B b215bb7800c157d6ef1461bd898be3b5
 DIST perl-5.24.1.tar.xz 11569284 BLAKE2B 0db211fcfda401d6fc6818aa45b024cebc413360dae14948c2c22c3d546e23d160f84382afdd38619e8766281be81e381d296bae9f34e8582db1a41847f2a1bf SHA512 9429608eb4d7f6a01b5a7df8601e0757acdf3e6d5af960d5cf710f8e4fd20ffe082bb42eedc2cd079d5173e48cf5574d55477e1c51f7f53b32fb5d1b89f6db8c
 DIST perl-5.24.2-patches-1.tar.xz 24012 BLAKE2B ad1890707e40e2f7b3ad420473ed85a5ab4eaba1820df1fc222c669b73d9052db54834db749a515a80d2a9eca8fb8ae441bd567e8dc23c0489c70283f98a50a2 SHA512 3576dbce373a17de2de436b6bd33378c9bca899dab71b7448e3c2d1df5ed3d63ea19ad0e0406526b9a75b416585e0da0c32e653e6f76474fbcd66672094d7aaf
 DIST perl-5.24.2.tar.xz 11570420 BLAKE2B 8a81d16c029976d0e251f9a7c1b475bfc2c4dbb7017086f620dc88781549a29a268f35685d1084260f317ea324a9d4acf536ca2c0540597879977a479a7af10f SHA512 d7bb66e23064aba426fe3f7264d065f0926957675b0bba51fe2ddb623561ffcdb7657d9f27d78920a583a21bdee01a7ace37aae6d42c02d32403bd1347ad8df8
-DIST perl-5.24.3-patches-1.tar.xz 24016 BLAKE2B 5eec6c5ddea5fb61b4edad3449e7efdfe546a06bde7421da8d54a64dc8f401cb48b416237c2a01b63736ad3ae83cb4e4ce0b55e7ce3f5eb4e92347f71c370b2c SHA512 5feddaa14b66c6c5f926a3bee96e2849d829141ee7a6d74cfec68128785fcb8de38e13cfd229c420a9fe6c3a1db4a4bdd52a91aa72726233570f61c73d31f9fd
+DIST perl-5.24.3-patches-2.tar.xz 23980 BLAKE2B 5de7ac2cc5238d0b8460a294ae2e8da1455f89a63691a4fc022d49756ed4c0e577672149de7bd475d10f4860b4a98dc1db0c6f32abaf80f8c04658f6ca706e11 SHA512 f13c5fac65e11d691b77231cc98b0a57b6ccabd66535835bc387410dc88c298d31fa471bcd9f4e86d4d51b0402483283c23dcd53d69e0dbabc77b9db6fea4936
 DIST perl-5.24.3.tar.xz 11574740 BLAKE2B 79e719d1d0fcea3eea71653f276d0d093d8d1f6b1f981b053f25e6891c57af9ee1982f65ce4a31e4c5844eb11a7966f25c6b459cc7de51cf62b9127be96f6f25 SHA512 139c92c0ea0ee7bd5912ad52cc275e0732ceb0865d8b67c301e1fc5a96ae126a26432b4450a2bbc7fe65b8e1dd8adde92ea2cc91ee39cb13ec3c5096e8f787ec
 DIST perl-5.25.11-patches-1.tar.xz 16776 BLAKE2B 424cfe4ecf5c0b5d857a694fb166dc78f45e0cad9a1f7605fc57c7bf7d16ee7261ba960cf5175525242a378a95ae7b5705ee1717813bc5327962e48b096e4a6b SHA512 ee340824746d3b626b41c76bfa901543869fb9560ef75ff6d338df017e5528e33c344a91ce7cbe9f2fa9e813bf61bbe9eb290433baceb05b832110e746ce9036
 DIST perl-5.26.0.tar.xz 11961692 BLAKE2B a0bf9cb04a6f1f8459351d6b0398c3ef7b8eb16d34981ec22002e0cdfc96baf6ff45679f97472e85b06403ec2f1d05c43d6b0293fb37bc674848b9a7c33fafab SHA512 cd5af6495fe4c46c0d5d0f51d4015b54daa221f08a5fb48899c247cb57c2ba85cffb97e6d258d0f931504828bb23e175d899f311c73805d924d1042058ac42e4
 DIST perl-5.26.1-RC1.tar.xz 11923212 BLAKE2B 0f07040bfa8e2ef8fff434d02f874e71b03013620ab79f5d2d04d254881d33753999c5cd1f7d64cc9887122328ae4fd6dcc904f6ff76e47a6d775e4d655faddc SHA512 036151303704e8d91db8cc22a9c8972499babca112d46f570e4f921fdad1b73919f6d038973896ff3d55b079080c4682609b3f73b962999bc5f5425b7b877084
+DIST perl-5.26.1-patches-1.tar.xz 16764 BLAKE2B 95fb086d214bf27dedfdc96f927e11ca6e2a237aabc268b3e26ca9868eeede3916fe6adc9ab890bc6bbc9977fa4a3c200188f91d506652c1f45f7ebdda9857e2 SHA512 24d7f5e1344a768bbf170376b131498fa234881d10edc259ff7a31572467e2fe1084ce6a2a9ef4d4ec5924ca95488064235d6e02b83acba727a856cd1e4c9ebc
 DIST perl-5.26.1.tar.xz 11922848 BLAKE2B 8ba5ac50bc6bc3cea1ede7dbd9b41566bd3f62e432d9a1f5ee45837cc3051c1edc037a13d73d4c867edc7833f9dfa8a9d22216e14a19df179ba030a03d3acc07 SHA512 13faa7bcd7ed8c490c37e9032c115af06c9b8152b75f8062409dd72d263d1314480e8a9a883490de1b448b2e6d53b6a87d108e2eceb17de2524d5857c6a7d300
-DIST perl-5.27.6-patches-1.tar.xz 16280 BLAKE2B e80e84bc233a0a73464e59610f56a2857bda91599aad0e166e07c01b5a7167a586ad9bb198b44e01e26dbedcb0be8ecfaa246e3b32ec1c7a03895197fe490976 SHA512 4dbac74a1463bfc54158052bffc8bc25ee5cd9dcf28049bff8d0595f5679a44dcb69030fe8fc4713a9d45cc38be03d0621b606f159f46ce689e0c1ebe55fd627
+DIST perl-5.27.7-patches-1.tar.xz 16276 BLAKE2B 81d6d4eb2459abd80d9dbf9a0300af3dac0e45f745ea844bd2d306b7fb816159470552179253d13ae13e20fe588e84b92bfae3a0189a76009b8cbb423b444209 SHA512 ef1084e307b57545de319248b8f9df6d7eae605604da9721e41b3f0f03e4c63b825e1cfee47eb0d52dc51f65ca2712d7c87f89a3e329d4bf7a6662f1fb08ce41
 DIST perl-5.27.7.tar.xz 12217704 BLAKE2B b443b6a0e23b522661e518bb302f9610806e722cd0c28d8d035b49ae78c39a9bb261cd2e3e03c5b65f549f53515ad27764a691b5fbe9464f4c57a5ff1100651f SHA512 e4a70a73a27dc102e59b8edf2dad73adb153fef7a4e52b6c1fe6d83a7db0deaecafc2db4fbac18b6ddcc8e8bf3e59ab4d4660714fbf0b0dbaf00da2bfa9f568f
 DIST perl-cross-1.1.4.tar.gz 94623 BLAKE2B 11ede9ad74e8f73e8bd8effea962933cba50e65e169fdcf4449a1a4f6df6f840a510033eab1e04c5d60f0aa14a660e0bf9e82569a553d2859c065c1c68056078 SHA512 3bfc108245f0c05b7d45c317eb28c2eb70aba528dfe8a39bc99d6e49b4751f5dca4f4ac661484bfc7528c3e28fcdbd8994c36daa49c25516618fec1f58116d79
 DIST perl-cross-1.1.5.tar.gz 95122 BLAKE2B 2b2596d156f3a7bb296855600ea37771412b0ba4e10be55fccd46c37aa7d1fe25e01ead283ecb8fa3becfbd6e3e9695c4eba4836c0d95ed0b8b827fc8017a8bb SHA512 344ae0ff3ab8a2ce3fdb0de10972164c8cc14abd9c5c9bf55029bc8a6c2e62b3f9dda88892b1d8d0e30b76f94d42feea1dd5e5c55631f9eb53d1443285e2e3d1
@@ -17,10 +18,10 @@ DIST perl-cross-1.1.7.tar.gz 97622 BLAKE2B c58dd51492cfbda6fc58b43d9de45c35dd5ed
 DIST perl-cross-1.1.8.tar.gz 98686 BLAKE2B e4fa78e99cb0b93025468d6035dfa352e78867003847637e3730df7f3df252cd13370b71b8c724e4dcc9c0851a8e224402ba6880a1ac666521a64b9053a7e4c2 SHA512 00de89c4b4dbef4aede397c541ef5b9c5b1c2b8fecc7ea4b8d5d133dcceb65da6e834ff28609e7865d24e563f050de25c72ce3a88a162d8c88e87524aac5217f
 EBUILD perl-5.24.1-r2.ebuild 17081 BLAKE2B 3f2b034a7d0f6d8ecffd137e878f70fd2ea799b2808668a7b1d4b2087f91a7df272083a954cc849717d30bd0a52a0261916969bc31f8493bbbd54151445a13f3 SHA512 7c46c1b392371db63a03d2174613cc008f50045f3a50693034853a2c809b59c8dbef7b36a00f2be20d5f09aae62760365c32d9268d770d49a20a9b191af0ecac
 EBUILD perl-5.24.2.ebuild 17076 BLAKE2B e9f0500f185c2e281aadb4a7025a478895946e8f4adcdd32bf27709e60387c523d07c00f4456e213a52304f3ec027d1432d13a823b52251ef4457dacbc4c08d3 SHA512 c6bafe77fe764ed6a318a731ee4240e31b1555afb45a416bf2e9eb650d680ea618f37b5dafdccdfd34e2676e5f1e3f1fbc8d4757d6694149a733b6f81f4251ea
-EBUILD perl-5.24.3.ebuild 17074 BLAKE2B adc941ce1cd25915a14d6f2b57c5f9d996dd2cd9145d14775b76dc1cd674f2031073ca6858d9a1fb49635ea580f89b7bfd6bb4dc34d6510ed2cfc8bf92144a16 SHA512 729ece15a14c7ab5c01d950d370bbf2a299c7782e39fbac9a90e911f7cff4696049284670a679b18fd0f430ecefbcfc966dbc1ad8d79628321efb8ae4ed901aa
+EBUILD perl-5.24.3.ebuild 17074 BLAKE2B d257e40d013889ebd6068960c23ac916e40340a363a165fbdcee6130078e565e3ea84cf86427add1a39fc17c99ce1fc3f38992daa60fb642ba2ca20162a01541 SHA512 bdc76815509e6d099fc3b8e5a56ce2b9eb6a621f8e6c7bd6a6afc1b31008d7b0adc4a6c126013eb6fcfa3959e421f44ece6d800e48d39acea49c5e374415de60
 EBUILD perl-5.26.0.ebuild 17878 BLAKE2B e49c729dcdf208399fdefeddc97e4e2ac57d289bb433b3ef0c2176f850dbb44477ac5b1e9c2b66fdbc0466c9a5c335c5f001f565e0fe3fe4f43a2790669e2105 SHA512 574fce3abb6a2ca762a4db9b9deb36906980d5d3c8a1c99cbd3761871e423a1bcd678c513e8d728359acfbccef67253743d48c14e544b4498f724e24ad965609
-EBUILD perl-5.26.1-r1.ebuild 19254 BLAKE2B 73e46934f072a5469f531b699d22e550d526ead8eb55f37675708f65655f7728241021d92362278f685250739c29dc8d30d4784e06cc3c04c239c0d449977fdb SHA512 320cd2b0eb69881e5893d06c304dbeedc64bc7878ff4ad2ec8864cd15274129fdff0b32710212569edcd8b94b542cf0bb617ca0aa73d3f579f182d46f71a0443
+EBUILD perl-5.26.1-r1.ebuild 19253 BLAKE2B 3d192d2a79bb036593ba46bc02fa901ddfbf4b4e53692f6635fe4f94b530888aab7d5e82b3cd47a74c24828052e53647373d71749b0fce61d0756972500ca8b0 SHA512 650d1573aaf99c30f5df0cb1ca8830cdf23e43b2a20acc0b3d75a52777f5b69df874894e929802c728bdfa6c6a7017f379ee56745b1dcf43862c66564345c5a1
 EBUILD perl-5.26.1.ebuild 18983 BLAKE2B ef92b27b06f0866a1e7e7a3d35f87d8378e1d6df1a42ab68e03682c978f35429f83f23beef2921a214382ecd84e706bddb4a49d1a218d5dc133b71f15faa327c SHA512 903eee39e82711ff898fc7b3628bd06baf7d5ce6ca0b685b7852991755cf7779cc869e076a14a13293eab549d60453026411d3dc2b277873184975ff9ff491c4
-EBUILD perl-5.26.9999.ebuild 19247 BLAKE2B e8b3991aea3b19d75e2db0ca6d4ace191175ab2c8e289014324e8d0a9457aeb20a184b22d27db28d4c4da2033c9878c3dd0d11eeed787a4b37458636ee19db9f SHA512 cd0795a3f6894a936f52e6c563aac208d160ea24a88b50a13c00b85ebb8515d0aea6c6c7f78183d89567f4a6d05926f4f9a3768014bf59818c5ea49f1d356a36
-EBUILD perl-5.28.9999.ebuild 19235 BLAKE2B cfcd732d653e123f1730da3a15c68699abe1c5fafb142f92ccc0afff79d860adf570243d89b0bd35fd119815fb93f2f25074e25a1cb1f995099ca52c6784a07b SHA512 18e4ac435bfc6588eac31bd33cea893c8fa24c2f5532716b5fb2803b121ed03ab56f8dc095c8c79437f1f913d4003998a39dc1dd26ce69caf063b298d94276cf
+EBUILD perl-5.26.9999.ebuild 19246 BLAKE2B 46e5b5a335ce98d2af68572a58453ba962c3aad3596cad0e88766f3d15c86a0fbebd00469ad90dc3f9c2cdacdc61a87392cc48ffab03cc6b86e42954ee9deff4 SHA512 2ac4f404c2080207756f74468a32c86ebceefff8c9b7b4f1b7ace2591c40f8aefe90b524d96b170f94c82f395c5fbe172a8e5f80ee83f1a1fc569ec65fa59f75
+EBUILD perl-5.28.9999.ebuild 19235 BLAKE2B a18915ba780736d3d62a51050fd22f711f1fe9fc95908d917c3299fa5f081f143a8c47de5c7d32454ecffd329701e80c886750fa25bf6497ab4c65ca963a7392 SHA512 9aea2dff0722f3174b6d12e25e7a438a6cc082bb32046ea42e27f9f15b771ef66a148578a69e85121f28fe49c54846828e6b1b72757b1f5d22026795058f88ea
 MISC metadata.xml 430 BLAKE2B 8625fd07f63a7943a85c3919d6ae6db622b752caa2803c56c72a22b270244261331fbab8b760e6d00acb8480770c9ef1d1beaaa22cc6044660821687c0cd8c33 SHA512 ca4c43e2016b7df707894713465700a90d2b8551b57fc4d660cff75edb1e8cc2456f9ae10431839ad6738f290d4f5911fae360eaa1d4670859d855de3d568583
diff --git a/dev-lang/perl/perl-5.24.3.ebuild b/dev-lang/perl/perl-5.24.3.ebuild
index cc82a2885505..9dd1429c6169 100644
--- a/dev-lang/perl/perl-5.24.3.ebuild
+++ b/dev-lang/perl/perl-5.24.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing
 
-PATCH_VER=1
+PATCH_VER=2
 CROSS_VER=1.1.7
 PATCH_BASE="perl-5.24.3-patches-${PATCH_VER}"
 
diff --git a/dev-lang/perl/perl-5.26.1-r1.ebuild b/dev-lang/perl/perl-5.26.1-r1.ebuild
index 3a6ded81ff59..b615761c70a9 100644
--- a/dev-lang/perl/perl-5.26.1-r1.ebuild
+++ b/dev-lang/perl/perl-5.26.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessin
 
 PATCH_VER=1
 CROSS_VER=1.1.7
-PATCH_BASE="perl-5.25.11-patches-${PATCH_VER}"
+PATCH_BASE="perl-5.26.1-patches-${PATCH_VER}"
 
 DIST_AUTHOR=SHAY
 
diff --git a/dev-lang/perl/perl-5.26.9999.ebuild b/dev-lang/perl/perl-5.26.9999.ebuild
index 79b8c3037c1f..f1cb393c0f39 100644
--- a/dev-lang/perl/perl-5.26.9999.ebuild
+++ b/dev-lang/perl/perl-5.26.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessin
 
 PATCH_VER=1
 CROSS_VER=1.1.7
-PATCH_BASE="perl-5.25.11-patches-${PATCH_VER}"
+PATCH_BASE="perl-5.26.1-patches-${PATCH_VER}"
 
 DIST_AUTHOR=SHAY
 
diff --git a/dev-lang/perl/perl-5.28.9999.ebuild b/dev-lang/perl/perl-5.28.9999.ebuild
index 5a408f1f40b6..dbf9b7c7ffeb 100644
--- a/dev-lang/perl/perl-5.28.9999.ebuild
+++ b/dev-lang/perl/perl-5.28.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessin
 
 PATCH_VER=1
 CROSS_VER=1.1.8
-PATCH_BASE="perl-5.27.6-patches-${PATCH_VER}"
+PATCH_BASE="perl-5.27.7-patches-${PATCH_VER}"
 
 DIST_AUTHOR=BINGOS
 
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 8e199dc644d8..9f2eb75b8d3b 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -13,13 +13,13 @@ DIST php-7.1.13.tar.xz 12194780 BLAKE2B 0bac1cb3ec46cd4206d71b0d8ec3058fff455bc7
 DIST php-7.2.0.tar.xz 12014940 BLAKE2B e34c5bfb076e62afc54c8e35e0e35491b803ec753a1e62a0d8e78dd5bb6c28b95a9434228e211b76913f721bd0d8009527c95d2ab7990780819f5d3b8d822c6f SHA512 828d38727edde0dbc6483add6cdc21d33527b887bffaedad2d7f53e25d58a6f661ac341a23db02741bc37248d161aaffd72026dd8ef85ac851594c127d6c0133
 DIST php-7.2.1.tar.xz 12094840 BLAKE2B fde1dc143598a74be552eef53d4e7a8cc5a09db67b8d98a4d527e6a7e6a0ad2b9e78429a8981074630c84bb6a95ee2bd8f1a78020062c770abb6fdbdba738cec SHA512 2445f2cff20214b521c48592e5ab42b770c291702178d7cb2a84912c81b7e5d2cc45948a3a4a7830194fa444708d544c73efbaa8e90c95ab77937f7feffb2ffc
 EBUILD php-5.6.32.ebuild 22500 BLAKE2B f1e8c507532244ed46c8d995cf847034ebb61abd52a52502c4897d2880e24d62ccf7e6fd843b3ddd1fb225ded90a4edb7f9e728a9313f28ad6b3072ab0eb6950 SHA512 b93ca82892cf15eac9c7d890b96974ea1d00cc224290cd4fe38e85c324231c77033c04667473fc787c173c83fee81d435339a70c155c63f253f28a2dbb7c4bdc
-EBUILD php-5.6.33.ebuild 22537 BLAKE2B 52e528c790fef79498084ade31d15e586dfc33d3e8fc048ebb9c132830877929f2b61db80372d8b18ee6c28c49250c07d4eb527ea0e58c5137b5697e644c10cc SHA512 1154c2fe968d68170058c615fc8ba985348a9a5b06b9875ec8e12e4dbf15fc898723be2b433cff130e4450f3031f1858c28c1ac10798d1004735b391f945d9ed
+EBUILD php-5.6.33.ebuild 22536 BLAKE2B 1757754fb7136cee47ef2940b5228738355e57a7af81998a26bd8869281e9c39bed80846aaeab0adbd6420830c2fe4ce8cef74c9ce6de62bf2dd69de534308c9 SHA512 b6a8ca4c8bfa937aef96f0ece0b4a6b2f79c92d05d35b96b94e746c8703b5889c87a56929815e68faeff3d408e703b457481a426a9735eb871a361f7216d9420
 EBUILD php-7.0.25.ebuild 21560 BLAKE2B 4898540287e3dd350526f9f13c6e066795dc3ab18ebc5e3278998d897919745efc76a1ee43ee8bddadbb3f570bc1b6779dec6ac055240379ef45c8f70ec61ec3 SHA512 38d1f2d063044db2f4500e99a323f54d992413db26b99926f4d0338190fd481964e1a1573e9ebf06ea315b66d3d1207cd620fcd487745e81739e03c34afe6230
 EBUILD php-7.0.26-r1.ebuild 21604 BLAKE2B cc4aa1057b2ba3964684e6cb4844af3619b65f1e59fc4edbe7a3e6994f888e5291b1efcf644bbccf9faa31484eeae3c14b4d3367f53def4b02cffdfe6879c270 SHA512 0ac3f8be4110647b47ba5546a0fb9b0ba1186ac7df664d93ef0687ff695e7dcb6d9a470433f0a3984dc3b019f48017757adf28bd83852387694e8f92ae359fbb
-EBUILD php-7.0.27.ebuild 21599 BLAKE2B b855401ba63749243ad418edd17701b59ebc70c7713529c2cbff138a5429ac2a7e84039db46a2fa3d0bcaf44791a6f96a4d30482cfe36f23d2f658b592d51c2b SHA512 8ad3f8ac2d63dad59e2a5ccdffa85772075dd8a7ebf0cbd7bfae633df9d8b17bebb1b68034b9ff5571ad34f593f24d98fb2acc9ea4d54a73881b950e50dcfb1c
+EBUILD php-7.0.27.ebuild 21598 BLAKE2B 4c74e446a7c8f556ed80cdbee1a44729cea2b5d35414480cd3c04f0b231980e39f75866c5a46f382a993cd0c926e84bd7d00faacae7894512fc71b0e677d27cc SHA512 1a29f78cf3b28dcf74d5dba8a28bb4cb380962361162788b05c333b899eeb7ff29fbca217fde2f7435d83e40e3ef271eafb163a1e3de959c1dd27ce868c0bb4d
 EBUILD php-7.1.11.ebuild 21443 BLAKE2B a6da3a5efbcae6b3d33d6c40e430137536ecee35d7ad2a2eb47da71041092037edf92f69ab1d642dd5b759619eb37fb1a44425d49284f3230f66cb59e85d968e SHA512 f62a2592c57d0c6641df2ed3388aa3a4fe1097e8f635066b7c3b6070b2e57e10e23f4ded9e3b79cee7876324efd0ca1feab13365eef9848457ca03cc6d7411c2
 EBUILD php-7.1.12-r1.ebuild 21470 BLAKE2B bede96eae794b62386e4ae4337e2d25187a716d91c494bf18e0769b3a4d58414729aeaf29955fb25aa0f56dff724f5be3d143901fd9ab02bec8166bba8b4adbe SHA512 ae7a59ce564a5fe30ba63289769842dc8ac58691b4f8ecb6379bd02fac9196d2ba0282cae8527a68b4406de1a0d35de8c2809f84aca502a0e3f925cc26ff2835
-EBUILD php-7.1.13.ebuild 21465 BLAKE2B e782e9c971db9b4e02ebac6c9cff0ba12ed5ea8549568cbdc23ea57af9178667e45e6f3f0a6f4617468a59e131cb0db94cecd682aee08b85ebab376b181f295a SHA512 3dc0f1d85ca723f9a63deb7a4598cb443aa608a13e77174aa82a0645d90483751d1786877aceb9d83199491a99b04107bbb622d78cc8ddfd0503e5629cf70a0a
+EBUILD php-7.1.13.ebuild 21464 BLAKE2B f272acdedc13e97d700a5799d340fa8c40e5aed08a9d360d4c1b505dbc9c28af2bc1aeb42de5beb1435a441ff95120a1752ee55ff0b07221e5c3164b9dcc6b8d SHA512 756e7f8fa503a9f97b88ce6c7d7af4fa6d9d9488300487be738ae2b9391aeabfde351f4994fd3c8c1ae8ae3c314e71f862b5223daf823be1eb022d3971723196
 EBUILD php-7.2.0-r1.ebuild 22001 BLAKE2B dec314b3eda1e8f8ddf4ced4ffcc2367ad8c08789408875099a4ed813a155fc1b7ae8a7f1bacde74fa663b108a480440e43e4efc3bf178e278f9238515e3454a SHA512 b3790484ad3141635284db9d01c3290af78a44d93455dcca529d19abeeb111daddc286af10cdf57b79bc0e33a70c27854ae7726bcaa82049ebb69b547798b54b
 EBUILD php-7.2.1.ebuild 22001 BLAKE2B dec314b3eda1e8f8ddf4ced4ffcc2367ad8c08789408875099a4ed813a155fc1b7ae8a7f1bacde74fa663b108a480440e43e4efc3bf178e278f9238515e3454a SHA512 b3790484ad3141635284db9d01c3290af78a44d93455dcca529d19abeeb111daddc286af10cdf57b79bc0e33a70c27854ae7726bcaa82049ebb69b547798b54b
 MISC metadata.xml 2439 BLAKE2B 7f3cb5f5eab3664c48b951bbf2cdb03b2ce5d119008bbb41dd2c59a34fffbac8c8911738b4988e7e58bf36a520f6c35f46e9383e6845747380109a2f2f3011a6 SHA512 5d0221b77317e021231a2c1ae1dc407dca0e7ad144f5648d9d1abf98434689d375b04c9c45795e38517ca3c3d6077acbe4ff79f3551b20adaeb06325e363ebee
diff --git a/dev-lang/php/php-5.6.33.ebuild b/dev-lang/php/php-5.6.33.ebuild
index e92e6e42d3d1..836d3f83ec94 100644
--- a/dev-lang/php/php-5.6.33.ebuild
+++ b/dev-lang/php/php-5.6.33.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2"
diff --git a/dev-lang/php/php-7.0.27.ebuild b/dev-lang/php/php-7.0.27.ebuild
index 03d64e1c1b85..4fe27674f649 100644
--- a/dev-lang/php/php-7.0.27.ebuild
+++ b/dev-lang/php/php-7.0.27.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-7.1.13.ebuild b/dev-lang/php/php-7.1.13.ebuild
index 7aa65736a04c..f3bf64e1e161 100644
--- a/dev-lang/php/php-7.1.13.ebuild
+++ b/dev-lang/php/php-7.1.13.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 6768d6bfb6f1..af4077310767 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -24,9 +24,9 @@ DIST python-gentoo-patches-3.5.4-0.tar.xz 11704 BLAKE2B 4a7d71feff18c7c8c109bed1
 DIST python-gentoo-patches-3.6.2-0.tar.xz 10744 BLAKE2B 3075754627617ac2ceee879eaf1a0e6564505655cdbdff380233a09df701a6188d64fe1f6a8c642b1fb05ef3c460a07042b6a362d655cd02717d6d9ba47983a1 SHA512 2aac1700c541202aa4f43bff4cb521b996d52ab350133318abaddb43f4b6e20548f37de472ace8024ef325ebf63fdfff0d43f8aa1f717d3c56f974b7aa1764e3
 DIST python-gentoo-patches-3.6.4.tar.xz 12888 BLAKE2B 7cf49ae22df53e855f2e99df51686b5d4bd0da82ef4c22836e24726ea9ed561808352c0305a5659b052d38b843f1ff61b6466a7bc3673b7e5cfb4d81d22fa4bc SHA512 90a1b685f2539872ffd67f96581f70145b7afaf18af19f4a7f4a61214103d2a10bf0069c1769dac229ae011fceaf8538f041082b33c1671905246d018d184dd7
 EBUILD python-2.7.14-r1.ebuild 10796 BLAKE2B 705db175a906c0087f462d4b7ed94ebfbf87acc5624d573860594ede1eea486ed65ff74967a64f24794e8f9efa85b27f9d74356bb069b82aaac47d906aa45b84 SHA512 d2dabd2997c85b26d82bebe4c9f3a24cf677cb3e0fd63c0a6896a3c29e73fec66f34eecdecddeb37264e51c3c379ddead561b4aef82f66b91289b8dc45c1402f
-EBUILD python-3.4.5-r1.ebuild 10591 BLAKE2B 72555298d0241e84f95d2fd2aa169f59b8fba25c5118bcbb2b8183c44cdb27e2dbbc98d8371cebe3ed30c6b5eb5706e4acb6c184d66efddcea1e71ff1187be81 SHA512 75bb75e86b32418c6587a327faa5ad1be7eb7cb35346a9af203ad5d2e4aa602bb7e09b3daac1efd94d573a18d80c90681f0a6628c731921288739664fcf86485
+EBUILD python-3.4.5-r1.ebuild 10670 BLAKE2B 2db50ef10323f864a5831813c65b180ffa5d4844ad680c21ad930ca517120941ad87d1f43e2734a8f6d8fd1c22fc1e6d84c397dfcf960df4eddf6bf22ce384de SHA512 efd34ae63f759f234b250e23c1ca6fa996dece9fe8da70cf496787dd52b20fd358f0d268985dd768a696769c3b61a184d98c460c96973b9e775dd5c4c9a677c1
 EBUILD python-3.4.6-r1.ebuild 10604 BLAKE2B cea6146a6b8643d1ba8def78647a83ee25bb055b9605c0f3d214220500034c7a412955fa8047a058e383dbcb832ddd1300ee2ff7a05b37d7dc7fa831d6631c5b SHA512 4aea9eed7fa7806d5eb8f51253c9665b6b887ed187db39959a42a99da2e4ef259109c1442886156019790b8f83c4a63dfb9e5ff33df318a9ec75521d02336359
-EBUILD python-3.5.4-r1.ebuild 10656 BLAKE2B 1c1c05f3c185f7390630e1eaaf2a44625c020875d6ae6da50e1741f3fcd2e387ec200bd4025bb7f44477e2f5fb2157b40a367f8f06ae2e2a92c3b17324dd8ab6 SHA512 1e4daf79ec691dac6b0ee57bfdf8f8e693f73d268b81068aeabf2b601a7cd22b315b8305f8aa35fda008903846c1bbd8894149d6b837571945248fe7013bb4eb
-EBUILD python-3.6.3-r1.ebuild 10089 BLAKE2B 110ebced7001de998877ddc0b6e2fbd65b720d77ed36ae11904011a77dd06c8e02cc40e15c70814fbad86102d2a97434f6f4d38809c1f476b8fb0e9fdcbbb460 SHA512 52fd7f2859179c6134674969fb485b4c020a87a2764b9b0ebd290ca007d85c13b169e71d2272660b532b8cd28b849ba7c647bc16d1e6814a4856e796959c32ae
-EBUILD python-3.6.4.ebuild 10016 BLAKE2B 5c8881506820cda98c9fd8428f94523007cea53502107d1664fb3f500571c4ce54084f477951948c5e8000d72467265f6f27190801707613790106bac71c7390 SHA512 9ff794f871015bb03dc5db8a5d1ee5d25c3d425d396a7470e6ea32d69a52914852aa3a8ca6d15135dad049d7cca7cee157ca1de152d44274e7fc45f3f9ae140e
+EBUILD python-3.5.4-r1.ebuild 10735 BLAKE2B df2555e4c3e63987f6df12111986b2bf856a953577db879fb3f637901de76e43a06a0ad9cfc1e3127a21f0f0a308e6a2500531b614ad4c11ae6ac9152155b94f SHA512 c9a1ba8db4a055d549d90bc41974adfe75272e9c38a6ad3ec218a13b28cf6c625a114dada4c40b950ab6c89121d411ce015147c22759d9a161cfdb1bdfcb9c54
+EBUILD python-3.6.3-r1.ebuild 10168 BLAKE2B 5c6da641f831b9ca0961db60b59132cea2d660f6c7030cbe92cdc1bbdcc0ed102d702d1e47f9a633737ae8928d28b51efb9a22bb5d2ca7599f53691f8c863a32 SHA512 2e5a90a7a36a6de21d5cde8c606aac0106b3e0a0503a78fe00177d2cdda8802737f9db5683c552170decf8520f1f2f9d3bab2940c20336368d62d8a36f9bf5df
+EBUILD python-3.6.4.ebuild 10095 BLAKE2B 1ffeae9ed685b550c0828905ff313e159b6eb0c3ce90e4de2fdc8d3d069723d2cf3ca8433cfb5505c50ca718c5bd6c2723cf01bf433655fda4b64dc54570c412 SHA512 b70f8be85568c444c42f0e6e9827c47a5712add30749e4aa2d8417e2f6a12d1d7f9571a26cc0e011e5ed30418711dc024b8555cb2d87147fdf60fa94f547854f
 MISC metadata.xml 738 BLAKE2B 464af9b051fa52c8d7f632163a0ea51e356f79d5f0a2ba82c8ac70ef2ebf5ea489bb0d5371ebd954ee0d5b07fc86b8497be3aa2f660929eb09c4a0222a6cf704 SHA512 f938683740658db5d8eb363bf0eb88a81aab75b7a9e4c5e33bca73722c3b1a8b879151bda58099d67c5596a7dd5d487f15b0f7327918e35ac997e15feaf89847
diff --git a/dev-lang/python/python-3.4.5-r1.ebuild b/dev-lang/python/python-3.4.5-r1.ebuild
index bb01c7623e5b..02cb5d3f2cbf 100644
--- a/dev-lang/python/python-3.4.5-r1.ebuild
+++ b/dev-lang/python/python-3.4.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,7 +17,8 @@ SRC_URI="https://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
 LICENSE="PSF-2"
 SLOT="3.4/3.4m"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
+IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
+RESTRICT="!test? ( test )"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
 # If you need to apply a patch which requires python for bootstrapping, please
@@ -48,6 +49,7 @@ RDEPEND="app-arch/bzip2:0=
 	xml? ( >=dev-libs/expat-2.1:0= )
 	!!<sys-apps/sandbox-2.6-r1"
 DEPEND="${RDEPEND}
+	test? ( app-arch/xz-utils[extra-filters(+)] )
 	virtual/pkgconfig
 	>=sys-devel/autoconf-2.65
 	!sys-devel/gcc[libffi(-)]"
diff --git a/dev-lang/python/python-3.5.4-r1.ebuild b/dev-lang/python/python-3.5.4-r1.ebuild
index 680ae491e0a4..35190a8535ca 100644
--- a/dev-lang/python/python-3.5.4-r1.ebuild
+++ b/dev-lang/python/python-3.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,7 +17,8 @@ SRC_URI="https://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
 LICENSE="PSF-2"
 SLOT="3.5/3.5m"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
+IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
+RESTRICT="!test? ( test )"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
 # If you need to apply a patch which requires python for bootstrapping, please
@@ -48,6 +49,7 @@ RDEPEND="app-arch/bzip2:0=
 	xml? ( >=dev-libs/expat-2.1:0= )
 	!!<sys-apps/sandbox-2.6-r1"
 DEPEND="${RDEPEND}
+	test? ( app-arch/xz-utils[extra-filters(+)] )
 	virtual/pkgconfig
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
diff --git a/dev-lang/python/python-3.6.3-r1.ebuild b/dev-lang/python/python-3.6.3-r1.ebuild
index 3d9849571a91..d904618dc9af 100644
--- a/dev-lang/python/python-3.6.3-r1.ebuild
+++ b/dev-lang/python/python-3.6.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -17,7 +17,8 @@ SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
 LICENSE="PSF-2"
 SLOT="3.6/3.6m"
 KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
+IUSE="build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
+RESTRICT="!test? ( test )"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
 # If you need to apply a patch which requires python for bootstrapping, please
@@ -48,6 +49,7 @@ RDEPEND="app-arch/bzip2:0=
 	xml? ( >=dev-libs/expat-2.1:0= )
 	!!<sys-apps/sandbox-2.6-r1"
 DEPEND="${RDEPEND}
+	test? ( app-arch/xz-utils[extra-filters(+)] )
 	virtual/pkgconfig
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
diff --git a/dev-lang/python/python-3.6.4.ebuild b/dev-lang/python/python-3.6.4.ebuild
index bf6b9a5fb09e..f0adb4196ea4 100644
--- a/dev-lang/python/python-3.6.4.ebuild
+++ b/dev-lang/python/python-3.6.4.ebuild
@@ -17,7 +17,8 @@ SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
 LICENSE="PSF-2"
 SLOT="3.6/3.6m"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
+IUSE="build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
+RESTRICT="!test? ( test )"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
 # If you need to apply a patch which requires python for bootstrapping, please
@@ -48,6 +49,7 @@ RDEPEND="app-arch/bzip2:0=
 	xml? ( >=dev-libs/expat-2.1:0= )
 	!!<sys-apps/sandbox-2.6-r1"
 DEPEND="${RDEPEND}
+	test? ( app-arch/xz-utils[extra-filters(+)] )
 	virtual/pkgconfig
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index dd1786a67c77..3ce60c4cd6c9 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,24 +1,16 @@
 DIST ruby-2.2.8.tar.xz 10520648 BLAKE2B 96c483786b1a7e0b1483c337a13fe7e07e740bb21b507b518e142dc9ac8cf19ba00c094b4357db4305c645d370d776269145b699ad11429aa56a0de78abfbf83 SHA512 e21004bee537f0c706f4ac9526507b414ddb6a8d721e8fad8d7fe88992a4f048eb5eb79f8d8b8af2a8b331dcfa74b560490218a1acb3532c2cdb4fb4909da3c9
 DIST ruby-2.2.9.tar.xz 10511456 BLAKE2B aeb631c47def96e8dd19e4f7281ef95833d9d0cde0912ffccd341032d2be22d6eebf259b0926f248298a5a290fd4d99b7ec38e29b805c9d77d4f3f4481fc0edb SHA512 c4ef84cd00f72f60d6c168f0726d9d7e9573549c2bbae83893e1a9d5e64fc7938f4c9d50a47147b28b37cbf36263f95e10a810c0797bad941775a48d75a8c933
-DIST ruby-2.3.5.tar.xz 11437868 BLAKE2B db50d7b36b6a8fa5b0b030f56d5d7bfc3c43e21d7255e9db73fed4d42cda1f161457c0f478e865766e2b7ef703335aa5b6bdf0bbc23c26a1cdb0163b75528de0 SHA512 c55e3b71241f505b6bbad78b3bd40235064faae3443ca14b77b6356556caed6a0d055dc2e2cd7ebdb5290ab908e06d2b7d68f72469af5017eda4b29664b0d889
 DIST ruby-2.3.6.tar.xz 11445628 BLAKE2B 052f09fef806581824b14196abecde7def7c4ebc922c8af75281fe26ec2a7a2a325d1702a382b29e91b302064ab55972b63430248813b24b591fe74b7bc18e30 SHA512 a09c8715097d16190ee17ee39e7a74438cefc9013add350217b7e3fb4d60aa9dcb30595adf832b0d67a5c45b1fe9d4effb767c995af2759420859f8d763c693a
-DIST ruby-2.4.2.tar.xz 10046412 BLAKE2B 33af07ee102367fe811dd3248edc72238bddfc3332f64280b6b36497c7de70bce939127c1efcc965072451ddd60ede98c855fc1fd24be9b12eedc58a21faad5a SHA512 c1d42272fb0d94b693452e703b0ea4942bf59cbd4b08ba83bf039f54be97ebc88511632413da0164970b4cf97bc302bccb88aab48edfa8fa147498e7ee741595
 DIST ruby-2.4.3.tar.xz 10040072 BLAKE2B 87ad9700312a104a60b079f4ef95804d2a9e01109e9fef6e83e593464f1d2c5077af54cbbaff6e0d25a925d05f513cade6c76f05960d9bcc1817bdee51ad4a0f SHA512 8bcf60c994a96787da5d743c66f5609a5a6d834d6d61243cdea7fd059197c3b10da43c99e5649be85e2f2329eedcbb1dd76e89ce3ac586be9056348f7449ed09
 DIST ruby-2.5.0.tar.xz 11292472 BLAKE2B 852ce003a79d9d77e72928353382962440e99ed1d03558c89a928e8f4a582b27357ef63e3ef45f3b30009f7a95f356100941bd84151571ade3a88b2d0595f8ad SHA512 55714a33d7661fe8b432f73c34fd67b49699f8b79df1cbd680a74899124d31111ab0f444677672aac1ba725820182940d485efb2db0bf2bc96737c5d40c54578
 DIST ruby-patches-2.2.8.tar.bz2 5764 BLAKE2B f50729480a4231db51de7981acb04dafa09d5fde592cf4a824a6fefe8ae3189ab9e82857e7ca41f1bb32dff1c4057ac37badf971c1b8f2981189e13d42dd38d2 SHA512 296387ec7f2ff82ad55f147d8f9568de544403d286ad24bb60aca916215d7ff6e1d6aca5a31c00a1999504989cda2bbd3260cae96c18ba73f9ffdcfd6b2695bd
 DIST ruby-patches-2.2.9.tar.bz2 5764 BLAKE2B f50729480a4231db51de7981acb04dafa09d5fde592cf4a824a6fefe8ae3189ab9e82857e7ca41f1bb32dff1c4057ac37badf971c1b8f2981189e13d42dd38d2 SHA512 296387ec7f2ff82ad55f147d8f9568de544403d286ad24bb60aca916215d7ff6e1d6aca5a31c00a1999504989cda2bbd3260cae96c18ba73f9ffdcfd6b2695bd
-DIST ruby-patches-2.3.5.tar.bz2 3593 BLAKE2B 48aba5d68ad7b648065a3580cb7160470ad308659fa11249afab1efe6482edf3805087f4054762717a89b61da4fd7a50c84ab8e76ba00052fd95d937655dcdba SHA512 eacb7f6787b36c7d848453b29152190a164ebc6882ab509eeb6584e49af4b66a665c4baff4ecf75e5831ae54d47dbc651d6f048918f3327500c429f1f419ed94
 DIST ruby-patches-2.3.6.tar.bz2 3030 BLAKE2B 7c1e80ff0569a03672f53820c665933056b46bcf791c9132cb9f358f72df693749f02da65ca7469c3dd0f652d7dc7bfaa03dccd4eb900562361876023fb65b42 SHA512 54cc3f2bfd1967b8558736e5a5240b886a56b22defca5813f45b1f4dca9af169b4d59d60b327ec8411e824970ac6da1cec53cfc31833403742e9d6941e5a78f1
-DIST ruby-patches-2.4.2.tar.bz2 3443 BLAKE2B d90cfb496ad8701fccb061fd314a7f2394b251c921f270f17c8335f617e71dacc8e4a2df4e76842b67eb34627e5f5291d8a2723f6dfed53a36ace3abad95a179 SHA512 fb8349c67c72caf10ec12c4b5410194b4df24345446c2e3b6c6176d00727bfe803f4a905ef094a2d52315b6f4c3ce74fb8fbaa2fdf5efe46e6ccb24bf8418b17
 DIST ruby-patches-2.4.3.tar.bz2 2898 BLAKE2B e46502dbb0aa25c3d71693a6c04b433bd4de60f194cdd283517c4b08da190356885d9bca4a6765402088185fa8ec681156e8e8eecf0703a2c1ea7bb81adc0bf9 SHA512 d767d43c7df737469247e42e1c4205b8c6850c8f335a2869c884f145c037e9bab10492cc7cd2903f5c33e232cdc5bbdabb3e8da837c7bf420b9d58d1d33149ed
 DIST ruby-patches-2.5.0-r1.tar.bz2 1888 BLAKE2B 38358c4d10a5c825ad1d50aa9e538fbfb0875deffaecf2064be3c52d593539f37b83bf726437922b1f13bd3d5c63e30ae071cd75c891e7083d3a363c4b49c905 SHA512 39068008cd7050a6787cfe35ef0a21ebeb5128226153b80f8d34e89bc77d6159f32e6980dfd8f3e38fc748cf3d648d102b3dcfcb79a484a517a5008bfd8161b9
-DIST ruby-patches-2.5.0.tar.bz2 1888 BLAKE2B 38358c4d10a5c825ad1d50aa9e538fbfb0875deffaecf2064be3c52d593539f37b83bf726437922b1f13bd3d5c63e30ae071cd75c891e7083d3a363c4b49c905 SHA512 39068008cd7050a6787cfe35ef0a21ebeb5128226153b80f8d34e89bc77d6159f32e6980dfd8f3e38fc748cf3d648d102b3dcfcb79a484a517a5008bfd8161b9
 EBUILD ruby-2.2.8.ebuild 6914 BLAKE2B 7c2786f023183c10e863890e9fac82228985d67bdde66546df59079c8a5c7b053b02e909ea5f6c0efc86df37c1d5ba000caa0a1c49cb260ed41291764f556aaa SHA512 2b5ab88539f49a91f4876598a910bfd80eb1789e738aa5c25489e12d9f7acefece189681c4600dd378da79049ae3712b0e90e2ec414163ef99333e54a0b5da68
-EBUILD ruby-2.2.9.ebuild 6916 BLAKE2B 5134933905d8d9c46a9347ec8d19772399b2287c6a4455a32f7fe65903cd675034b131186f49c0523d505281527ae72f3079dcd6b1b072a54f8c57729186d7b2 SHA512 736f941e251f7569b1415cae2279dcd9fe0630ade1484c8da8a77747366d471687a96a99424f758945ac7af781907a36805b80d2bd994b0b4536f06360025036
-EBUILD ruby-2.3.5.ebuild 6877 BLAKE2B 5d55fe0c3bd56afed1c040fba22f7ead461ef5c55edb43bf1d7a435db24921434f1a2a7d48f473d2bdc3d56f714ffbc3c0c3de24855f1b8aee10b0e3266b89f0 SHA512 059ec424075082c9809a0951dec55e38b9861124632b10167ed696081ed2402c14a7575dfb9a62152529957f768f69f6bf6424d70a85e5b6d3374884ea86d1fc
-EBUILD ruby-2.3.6.ebuild 6877 BLAKE2B 5d55fe0c3bd56afed1c040fba22f7ead461ef5c55edb43bf1d7a435db24921434f1a2a7d48f473d2bdc3d56f714ffbc3c0c3de24855f1b8aee10b0e3266b89f0 SHA512 059ec424075082c9809a0951dec55e38b9861124632b10167ed696081ed2402c14a7575dfb9a62152529957f768f69f6bf6424d70a85e5b6d3374884ea86d1fc
-EBUILD ruby-2.4.2.ebuild 6978 BLAKE2B 0262a40a78def3c9a83931573282cd2da8aa3ebeff7cdd8d36c3064a75cac1ef2d4196c0e7dc814d3f33473af17bc343ed77ecb7e807aa1848d826dcc0a1b6d1 SHA512 c6f48c8357e5248046ec8e811d6e96c57c073d5494cefded64baf1b5c177bc9e7a4a5e545b3ca5e977bd648066b568b1f5c9df59387540f2a145159e75f09795
-EBUILD ruby-2.4.3.ebuild 6978 BLAKE2B 0262a40a78def3c9a83931573282cd2da8aa3ebeff7cdd8d36c3064a75cac1ef2d4196c0e7dc814d3f33473af17bc343ed77ecb7e807aa1848d826dcc0a1b6d1 SHA512 c6f48c8357e5248046ec8e811d6e96c57c073d5494cefded64baf1b5c177bc9e7a4a5e545b3ca5e977bd648066b568b1f5c9df59387540f2a145159e75f09795
-EBUILD ruby-2.5.0-r1.ebuild 6770 BLAKE2B f534d42b8f9029fc982a32bc92472ed53b905b3b6e6f81124ba95a74e42025298702c7bb019f30993aae2fc1e8169c16f6b91fee9f233a24b541da854ff31a86 SHA512 395cc8b422f05e3f54454c9a385eb1141fc0433cb78e35182a92bce4481c1f34bea25d4d8d6fd7e58d88227d0d8baa169f1f96e4bf25fd7d732c2d6887911444
-EBUILD ruby-2.5.0.ebuild 6770 BLAKE2B a4dd6ef37a11404c45fee2118f9baa3933833ae14e5a116c4bb3c3a325406f45cc51c4272609ef911a29420580ea47af7005e139e2fb339e816c68ec8ad60dec SHA512 9051627249d026f2954ad16f97eea9fde9b172a81c2f82737df6fb70ea41be3a5e3fbe97458edf62e001e7f568a54d2e70245002d6d4e381e87ead0385d10c9e
+EBUILD ruby-2.2.9.ebuild 6918 BLAKE2B d256a2a67d771d60f91f812e197de51dc4ecb5d0b4375b6169202b125c33c67799b13cc0a05699a9de83f5e61ed54b444b7bdb5546bceb2c5ea3772177983916 SHA512 f82ed10a92e10b5630c0a6490fbc3b06e19a1478d4c156423407fb2de29e3e410fa2ae74024ea1132e0010f8e5110e35e3a72ab80c1b685e9a2da7e7fce00063
+EBUILD ruby-2.3.6.ebuild 6879 BLAKE2B 8bbcca439d930636acfde2fe08b8c14db10ca082450db0a4151201299d348da03e6f0b4950c9130a8790a812a5cb4e8788255220390ed7114be03f18952b0e28 SHA512 dc5c06c61c3ba08b902f655cde5435a3512653e559f694c71b5f669f177c0321abcebaa7deb06f2370d7c78940ecd776d7f111a6a39c2a1954aaaf7ded1ef384
+EBUILD ruby-2.4.3.ebuild 6980 BLAKE2B 2a08be5225e43fd5e5d7c90ff63ed43b6eab9b6e69ac1df7aead9657d651267e8bc0e741e16a276bee7fe5ecca5565d17d1428d96e5713305d278f251cdd99f4 SHA512 f43e497753a3fcfc0ff3e4ff840ae8cf3003671da0fe55e62651c17592f885cdbb99ed76ff6b99581ffd0903d23bc03b5425839f884f9e0e7ed925fb748edd4d
+EBUILD ruby-2.5.0-r1.ebuild 6772 BLAKE2B f9ac0a58ebcd718715fb67cbbe90cc853a14d8ba717bd91e93645115c5b37dc4def3827dbd01ba7b91138468b124c3581f90a133e88884a7f2b9a902f3b4ad82 SHA512 ed302d0d2a27d002a1b89aaea3b25ce6c88660f1fd30469cc2d292cfe3679bc477b6f8ac986964db45541db091be3040ee8dc8a76f5c10995d307dcb4246042b
 MISC metadata.xml 911 BLAKE2B 7596a3d7a53742635e3262a0deac45eb6c37e51b473dde2b5da78742baba1ecab42a4a3e2f992cfa8f3765472df896ccff2e2936ba5dedba1aad05c2ab47d9dc SHA512 c5d9f15742132625061303ed71206e937933b402e183edbe0f37ee73ac7ba47b3f7ad54cbf12d1db3900a1f833ea2432790a10a02ba7e1e0c4bf128a716b9d72
diff --git a/dev-lang/ruby/ruby-2.2.9.ebuild b/dev-lang/ruby/ruby-2.2.9.ebuild
index 05de5df039dd..38ba9ac801b2 100644
--- a/dev-lang/ruby/ruby-2.2.9.ebuild
+++ b/dev-lang/ruby/ruby-2.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -35,7 +35,7 @@ IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests sock
 
 RDEPEND="
 	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm )
+	gdbm? ( sys-libs/gdbm:= )
 	jemalloc? ( dev-libs/jemalloc )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
diff --git a/dev-lang/ruby/ruby-2.3.5.ebuild b/dev-lang/ruby/ruby-2.3.5.ebuild
deleted file mode 100644
index d41fd224c419..000000000000
--- a/dev-lang/ruby/ruby-2.3.5.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(get_version_component_range 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=2.3.0
-
-if [[ -n ${PATCHSET} ]]; then
-	if [[ ${PVR} == ${PV} ]]; then
-		PATCHSET="${PV}-r0.${PATCHSET}"
-	else
-		PATCHSET="${PVR}.${PATCHSET}"
-	fi
-else
-	PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
-		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm )
-	jemalloc? ( dev-libs/jemalloc )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? (
-		dev-lang/tcl:0=[threads]
-		dev-lang/tk:0=[threads]
-	)
-	ncurses? ( sys-libs/ncurses:0= )
-	readline?  ( sys-libs/readline:0= )
-	dev-libs/libyaml
-	virtual/libffi
-	sys-libs/zlib
-	>=app-eselect/eselect-ruby-20151229
-	!<dev-ruby/rdoc-3.9.4
-	!<dev-ruby/rubygems-1.8.10-r1"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/did_you_mean-1.0.0:1[ruby_targets_ruby23]
-	>=dev-ruby/minitest-5.8.3[ruby_targets_ruby23]
-	>=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby23]
-	>=dev-ruby/power_assert-0.2.6[ruby_targets_ruby23]
-	>=dev-ruby/rake-10.4.2[ruby_targets_ruby23]
-	>=dev-ruby/test-unit-3.1.5[ruby_targets_ruby23]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby23]
-	>=dev-ruby/json-1.8.3[ruby_targets_ruby23]
-	rdoc? ( >=dev-ruby/rdoc-4.2.1[ruby_targets_ruby23] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700. Use explicit version numbers to ensure rm fails when they
-	# change so we can update dependencies accordingly.
-	rm -f gems/{did_you_mean-1.0.0,minitest-5.8.3,net-telnet-0.1.1,power_assert-0.2.6,rake-10.4.2,test-unit-3.1.5}.gem || die
-
-	# Fix a hardcoded lib path in configure script
-	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-		configure.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local modules= myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-	# SuperH needs this
-	use sh && append-flags -mieee
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use readline ; then
-		modules="${modules},readline"
-	fi
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use ncurses ; then
-		modules="${modules},curses"
-	fi
-	if ! use tk ; then
-		modules="${modules},tk"
-	fi
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--docdir=${EPREFIX}/usr/share/doc/${P} \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_with jemalloc jemalloc) \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 V=1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	rm -rf ext/json || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake V=1 DESTDIR="${D}" install || die "make install failed"
-
-	# Remove installed rubygems and rdoc copy
-	rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -rf "${D}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
-	rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -rf "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-	fi
-
-	dodoc ChangeLog NEWS doc/NEWS* README* || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(22|23|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-2.3.6.ebuild b/dev-lang/ruby/ruby-2.3.6.ebuild
index d41fd224c419..e1b0efffb5fe 100644
--- a/dev-lang/ruby/ruby-2.3.6.ebuild
+++ b/dev-lang/ruby/ruby-2.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -35,7 +35,7 @@ IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests sock
 
 RDEPEND="
 	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm )
+	gdbm? ( sys-libs/gdbm:= )
 	jemalloc? ( dev-libs/jemalloc )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
diff --git a/dev-lang/ruby/ruby-2.4.2.ebuild b/dev-lang/ruby/ruby-2.4.2.ebuild
deleted file mode 100644
index 46a0abb33724..000000000000
--- a/dev-lang/ruby/ruby-2.4.2.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(get_version_component_range 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=${SLOT}.0
-
-if [[ -n ${PATCHSET} ]]; then
-	if [[ ${PVR} == ${PV} ]]; then
-		PATCHSET="${PV}-r0.${PATCHSET}"
-	else
-		PATCHSET="${PVR}.${PATCHSET}"
-	fi
-else
-	PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
-		 https://dev.gentoo.org/~graaff/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl static-libs tk xemacs"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm )
-	jemalloc? ( dev-libs/jemalloc )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? (
-		dev-lang/tcl:0=[threads]
-		dev-lang/tk:0=[threads]
-	)
-	dev-libs/libyaml
-	virtual/libffi
-	sys-libs/zlib
-	>=app-eselect/eselect-ruby-20161226
-	!<dev-ruby/rdoc-3.9.4
-	!<dev-ruby/rubygems-1.8.10-r1"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/did_you_mean-1.1.0:2.4[ruby_targets_ruby24]
-	>=dev-ruby/minitest-5.10.1[ruby_targets_ruby24]
-	>=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby24]
-	>=dev-ruby/power_assert-0.4.1[ruby_targets_ruby24]
-	>=dev-ruby/rake-12.0.0[ruby_targets_ruby24]
-	>=dev-ruby/test-unit-3.2.3[ruby_targets_ruby24]
-	>=dev-ruby/xmlrpc-0.2.1[ruby_targets_ruby24]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby24]
-	>=dev-ruby/json-2.0.2[ruby_targets_ruby24]
-	rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby24] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700. Use explicit version numbers to ensure rm fails when they
-	# change so we can update dependencies accordingly.
-	rm -f gems/{did_you_mean-1.1.0,minitest-5.10.1,net-telnet-0.1.1,power_assert-0.4.1,rake-12.0.0,test-unit-3.2.3,xmlrpc-0.2.1}.gem || die
-
-	einfo "Removing bundled libraries..."
-	rm -fr ext/fiddle/libffi-3.2.1 || die
-
-	# Fix a hardcoded lib path in configure script
-	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-		configure.in || die "sed failed"
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local modules= myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-	# SuperH needs this
-	use sh && append-flags -mieee
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use tk ; then
-		modules="${modules},tk"
-	fi
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--docdir=${EPREFIX}/usr/share/doc/${P} \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_with jemalloc jemalloc) \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs install-static-library) \
-		$(use_with static-libs static-linked-ext) \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 V=1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	rm -rf ext/json || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake V=1 DESTDIR="${D}" install || die "make install failed"
-
-	# Remove installed rubygems and rdoc copy
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-	fi
-
-	dodoc ChangeLog NEWS doc/NEWS* README* || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${EROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(23|24|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-2.4.3.ebuild b/dev-lang/ruby/ruby-2.4.3.ebuild
index 46a0abb33724..76b123a6e62f 100644
--- a/dev-lang/ruby/ruby-2.4.3.ebuild
+++ b/dev-lang/ruby/ruby-2.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -35,7 +35,7 @@ IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests sock
 
 RDEPEND="
 	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm )
+	gdbm? ( sys-libs/gdbm:= )
 	jemalloc? ( dev-libs/jemalloc )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
diff --git a/dev-lang/ruby/ruby-2.5.0-r1.ebuild b/dev-lang/ruby/ruby-2.5.0-r1.ebuild
index 22de96c87ec1..a6c97c1a7362 100644
--- a/dev-lang/ruby/ruby-2.5.0-r1.ebuild
+++ b/dev-lang/ruby/ruby-2.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -35,7 +35,7 @@ IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests sock
 
 RDEPEND="
 	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm )
+	gdbm? ( sys-libs/gdbm:= )
 	jemalloc? ( dev-libs/jemalloc )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
diff --git a/dev-lang/ruby/ruby-2.5.0.ebuild b/dev-lang/ruby/ruby-2.5.0.ebuild
deleted file mode 100644
index 0149280e2408..000000000000
--- a/dev-lang/ruby/ruby-2.5.0.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(get_version_component_range 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=${SLOT}.0
-
-if [[ -n ${PATCHSET} ]]; then
-	if [[ ${PVR} == ${PV} ]]; then
-		PATCHSET="${PV}-r0.${PATCHSET}"
-	else
-		PATCHSET="${PVR}.${PATCHSET}"
-	fi
-else
-	PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
-		 https://dev.gentoo.org/~graaff/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl static-libs tk xemacs"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm )
-	jemalloc? ( dev-libs/jemalloc )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? (
-		dev-lang/tcl:0=[threads]
-		dev-lang/tk:0=[threads]
-	)
-	dev-libs/libyaml
-	virtual/libffi
-	sys-libs/zlib
-	>=app-eselect/eselect-ruby-20171225
-"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25]
-	>=dev-ruby/minitest-5.10.3[ruby_targets_ruby25]
-	>=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby25]
-	>=dev-ruby/power_assert-1.1.1[ruby_targets_ruby25]
-	>=dev-ruby/rake-12.3.0[ruby_targets_ruby25]
-	>=dev-ruby/test-unit-3.2.7[ruby_targets_ruby25]
-	>=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby25]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby24]
-	>=dev-ruby/json-2.0.2[ruby_targets_ruby24]
-	rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby24] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700. Use explicit version numbers to ensure rm fails when they
-	# change so we can update dependencies accordingly.
-	rm -f gems/{did_you_mean-1.2.0,minitest-5.10.3,net-telnet-0.1.1,power_assert-1.1.1,rake-12.3.0,test-unit-3.2.7,xmlrpc-0.3.0}.gem || die
-
-	einfo "Removing bundled libraries..."
-	rm -fr ext/fiddle/libffi-3.2.1 || die
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local modules= myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-	# SuperH needs this
-	use sh && append-flags -mieee
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use tk ; then
-		modules="${modules},tk"
-	fi
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--docdir=${EPREFIX}/usr/share/doc/${P} \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_with jemalloc jemalloc) \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs install-static-library) \
-		$(use_with static-libs static-linked-ext) \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 V=1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	rm -rf ext/json || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake V=1 DESTDIR="${D}" install || die "make install failed"
-
-	# Remove installed rubygems and rdoc copy
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-	fi
-
-	dodoc ChangeLog NEWS doc/NEWS* README* || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${EROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(23|24|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 059e5278a4f0..d81c81176d85 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/collada-dom/Manifest b/dev-libs/collada-dom/Manifest
index 4306d72a5166..a9d725585711 100644
--- a/dev-libs/collada-dom/Manifest
+++ b/dev-libs/collada-dom/Manifest
@@ -3,8 +3,10 @@ AUX take_snapshot.sh 330 BLAKE2B 7203b021e0d78d1985015e5c57d7e1eb3ff5b537c4ff448
 DIST collada-dom-2.4.0.tgz 42517651 BLAKE2B 4bc0997d762a6626b78ef6a80d4ca01e98f1209d1628cd58b9734b5cb3a93fdd47826b08aa70e8334cb85f713bf36c9a93ca93219406d2bb5f77a2a077fba1fd SHA512 6de67dc0e631cd02c4bc5567667e7bcee4a41a137310326d5b8290e088a757f7313454028473df3e198f73b3c2db7572a437f7256e666b44ed34fe81d44229c1
 DIST collada-dom-2.4.3_pre20150112.tar.xz 2272092 BLAKE2B 0d6077fd4877a60fb02ab29a4a2e301f70e91316e390474a9ec37a528d69ec6273bc995961816be43679dd601ad2857f4c71775e639ae1e311d837793164cc98 SHA512 46c237c123a9d1b9cc8e07bf992b4386c064a3382b44be1347ab4bc6dce85f75ad59da0a5740f97c879c982e5a1119dcec5ced82d4dd725efd789021b0ead7f1
 DIST collada-dom-2.4.4.tar.gz 4507681 BLAKE2B 3a5c0c4813202e2a14b54dd72b2a5ef6564b58ab6dbbe56625eb3ea09d2fb6c06dd23edc9a5d3de7f9c1a6ea9aeadc30089499748eabb5b9f334d7ec30b420fe SHA512 3a89357cca0e219d1af3830f85fe1e09928e469e90b5c124be9e0cc5acfa3ab897b484b225f572cf26435c9b4671c97eb5ea5d156b99b03e13f120d3ba1f1dcb
+DIST collada-dom-2.5.0.tar.gz 4509266 BLAKE2B bf09937680897850dd5c288fd4245b403f11d88a0dfecb8f22d83b82759078f2dce201ed871fb644b165deefce05893354badf75911ab56bb2730e318c472407 SHA512 f189d09e2396faa266734981bb7b5e91ec34b6faa9ad340206e769dae316496bf4271c129980668dc2756874dbb8c1157162197d0d3a74075e35200821875156
 EBUILD collada-dom-2.4.0.ebuild 490 BLAKE2B a8d73153fa630cbfa17e43001841a389db976a3e90be40cdab9e92f64fb700085fb32e09e4bf176dbc28e2bfc164a35236be2c27c1d31f9e9ff2ef01bfca32de SHA512 172680175df2c855767e51664ed37c3bdac37b73c0bd26aa8b40ce2b956995091520b02c98d86e105184c2b32777717b1fb4b0ccec0f21454c941c2464132ce5
 EBUILD collada-dom-2.4.3_pre20150112.ebuild 845 BLAKE2B 1b4aeb94df0d5d3333ae6858a0d84d73e30e874ebd4f51941f9059e7789f4b1bfb5fef96c5fdf637b415dabcd4a8d8f58f047c6dffd1fb54fb5a266847652ec7 SHA512 7559773cef187902ddc80eb6189e60323de517c5ec6bb4acb2761b93f769f508f7cf7e2982d414fe2c2df95e6844fb69fa8b60f4e33109da9750fa67b4082e1d
 EBUILD collada-dom-2.4.4.ebuild 888 BLAKE2B 5b22f503f455b4f9c8a7a293d1abded2992c4e661ff545d9cdb322d0435321918aa8948f46defc7b006709a787a1914c127d735a02390bcde8cb191f739651fe SHA512 561bdcf5c01267268a9252bdcda385a85f0430f0ee468ec63228f24443503eb23bc82fb51f6474ffe24e8d33af66d6e7c395f148179a048f17aef337b60b6582
-EBUILD collada-dom-9999.ebuild 845 BLAKE2B 73afad1e26810c3dab3c2267fa8b9ab34693f9f7746a0676b2a7ef2acfb58995f1156047ab339f4a4f87669fedd26e413100c176db1a74a4ba67aa78d42df84f SHA512 eab966f777bc89031f2c1e79625607e1247f69a0b5ce99136296bc23fb03dbc28a923c66ce598424734764b1eadbdf8dd53506f45f2dc8ab1ffe9ef1ae5d0213
+EBUILD collada-dom-2.5.0.ebuild 848 BLAKE2B 001756b73b333782ff89489b0a0a3016593898dfd151a08a649898becdea37f2c6fac109a92cf3e2e3a7f8524ba109e829c8f9501f9ff5c0f338fa7e2d63a6e0 SHA512 2b094bed950e0efc432372ea7ac139172ddda6c84858585d265c5ebea4cfc7efc9696cd5720931aed6e1c1bdb27bf5ce0e0cdd4057347a8f9ca67f1c63aab987
+EBUILD collada-dom-9999.ebuild 848 BLAKE2B 001756b73b333782ff89489b0a0a3016593898dfd151a08a649898becdea37f2c6fac109a92cf3e2e3a7f8524ba109e829c8f9501f9ff5c0f338fa7e2d63a6e0 SHA512 2b094bed950e0efc432372ea7ac139172ddda6c84858585d265c5ebea4cfc7efc9696cd5720931aed6e1c1bdb27bf5ce0e0cdd4057347a8f9ca67f1c63aab987
 MISC metadata.xml 402 BLAKE2B 34446b3bb91ea6d424455de22a994a55c33f3ce088c7e8ff4307a25816c0d685d632c4b5628c939dbf5901cbcef7d2e143bcf45f64f7046c3419f0b7fd121935 SHA512 7798cc43db032d2cee13b739812802e530b3ea9ba6c4ef5439a439bb77884d68ddae6d0c6e11d491b44e7598fad936e5ac455ca5d7bd39ce5e1689ad2c2555e4
diff --git a/dev-libs/collada-dom/collada-dom-2.5.0.ebuild b/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
new file mode 100644
index 000000000000..46cc5b8cffbf
--- /dev/null
+++ b/dev-libs/collada-dom/collada-dom-2.5.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/rdiankov/collada-dom"
+fi
+
+inherit ${SCM} cmake-utils
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+elif [ "${PV%_pre*}" != "${PV}" ]; then
+	# snapshot
+	KEYWORDS="~amd64 ~arm"
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+else
+	KEYWORDS="~amd64 ~arm"
+	SRC_URI="https://github.com/rdiankov/collada-dom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="COLLADA Document Object Model (DOM) C++ Library"
+HOMEPAGE="https://github.com/rdiankov/collada-dom"
+
+LICENSE="MIT"
+SLOT="0/25"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	sys-libs/zlib:=[minizip]
+	dev-libs/libxml2
+	dev-libs/libpcre[cxx]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/dev-libs/collada-dom/collada-dom-9999.ebuild b/dev-libs/collada-dom/collada-dom-9999.ebuild
index 83ffeacb1b62..46cc5b8cffbf 100644
--- a/dev-libs/collada-dom/collada-dom-9999.ebuild
+++ b/dev-libs/collada-dom/collada-dom-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,7 +27,7 @@ DESCRIPTION="COLLADA Document Object Model (DOM) C++ Library"
 HOMEPAGE="https://github.com/rdiankov/collada-dom"
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="0/25"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index a0129ce48302..9b1f1b05a3ef 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -11,5 +11,5 @@ DIST libical-3.0.1.tar.gz 865208 BLAKE2B c03fb922bbd8b86f30ab61c83ba81281ba42aee
 EBUILD libical-1.0.1.ebuild 1276 BLAKE2B 4190c6409f897dfe7755b1e81a11b1e3ca10fbf60cc62a9117f7ec23d0186f64235d0b8f831ff7c0de26490582eb4399050443ecece277e23fdbccb8948412eb SHA512 712364e9a0276b05cd98e6ca57fa974f653540da3e884a5ae3ce9d9d08e75910860396daf839a9dd086afbdf2cfbc8ef3bf16c5d0640828750cbd616ce5f8117
 EBUILD libical-2.0.0-r2.ebuild 1520 BLAKE2B 9ad414a45f931658615a4844fa2ff3aba21b94ba335c5fd9635c8cb4fed0c92a9ffdceadaac653e0ebe2ac92f589122dfdeafb1044a5733c17b6a795b37b8ded SHA512 2c4c9120e6ef37e9f5e71452cfb73c24354afc53b8abc8f5d43fc0f7357a91ff6041efa46fcf1e6ce6586fde3c80ce92b0c5518bf1116e95726197ffa8dee09a
 EBUILD libical-2.0.0-r3.ebuild 1716 BLAKE2B 8e769d8440e6f00260bf0a5118ad1d21014541570b63b236cfcec038aaf185b42f3a758f1f93062a925fa8485bbb519bc5700767a5d71bf6cbfe85d5280503a7 SHA512 af97e27b3e8530018ff7e9fed1f03a96f03e823d52c935527649ca776e7b6884a34953a2519d00ba129dc30508ea99655ff5b4d5848deaa77878ca3328d1a8d5
-EBUILD libical-3.0.1.ebuild 1988 BLAKE2B 3138c3a6640cb94572fe9d18fab0249e46c086ae3e8ede7fed91d3d157ff99ef9095641d864dab397e749ec08d8a10b5574cc51a74cf2817838495634a895bba SHA512 ccc842bf0e764eaf001777daf54c0328d305aba2ce199f5ac46845dbc046f55f52b3a5eaf230fafefb35e1292011887f94210f8e639daa218891dc2a61ffe7f5
+EBUILD libical-3.0.1.ebuild 1988 BLAKE2B ed29518f1db3fb3b12eb648c167e70e0a992f6f28a6edf55cf4cc5b54e1ad42d1448d22a33b64e2e252d656745bfa27b2cf8fbc15dea80fee15a9de3315c73c3 SHA512 1ec6ac8c38e99e1609e88337a4b4a4c9b60a1670abd0cf72dd08d0de06340e083a36b1361c05b281834886ca0ea25119dcedf03d8ad21de23b7f4d2bc83b7350
 MISC metadata.xml 333 BLAKE2B 48ec5d867610d142260cd1d0154f2762acd3c695935a37ae5e344a828a84ea6907be5cf69b3b19a6886b20ac3df73a8d7cd5c800afdbce0320b2fcfe4e0b62d2 SHA512 ad7a78aff5c325aa5a289cb96a98c55d52c60bb78b6dff207d393157d1dc7e408032453be4da87e9a7e8c6a2ca1f12226e416be2f5d04e4dd908642461eb3b8c
diff --git a/dev-libs/libical/libical-3.0.1.ebuild b/dev-libs/libical/libical-3.0.1.ebuild
index 4ad4a28d615e..851a3c097a0e 100644
--- a/dev-libs/libical/libical-3.0.1.ebuild
+++ b/dev-libs/libical/libical-3.0.1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="An implementation of basic iCAL protocols"
 HOMEPAGE="https://github.com/libical/libical"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="|| ( MPL-1.0 LGPL-2.1 )"
+LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
 SLOT="0/3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="berkdb doc examples static-libs test"
diff --git a/dev-perl/B-Utils/B-Utils-0.270.0.ebuild b/dev-perl/B-Utils/B-Utils-0.270.0.ebuild
index 6e178ab56c0b..fa3e3ecc9bdf 100644
--- a/dev-perl/B-Utils/B-Utils-0.270.0.ebuild
+++ b/dev-perl/B-Utils/B-Utils-0.270.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Helper functions for op tree manipulation"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="test"
 
 # needs Scalar::Util
diff --git a/dev-perl/B-Utils/Manifest b/dev-perl/B-Utils/Manifest
index c9790a7704df..6cac43e66d86 100644
--- a/dev-perl/B-Utils/Manifest
+++ b/dev-perl/B-Utils/Manifest
@@ -1,3 +1,3 @@
 DIST B-Utils-0.27.tar.gz 74612 BLAKE2B 4bac004543111890385dc0ba59fd73f25f4d3aea169c243487144deafe99c114f9783b4271570f3c2f40566f73767bc414818396d786c46d8b9fae9977c18b0f SHA512 a896476f59a424fa9062c5dfe6431493c020e51746fa7f7b4c7fcdb109d1c0fa252292b891263d676884f064db95f16958a5d2ed5981dc5997436dced6579e74
-EBUILD B-Utils-0.270.0.ebuild 571 BLAKE2B 9c8e137781a50fe14fde79926f069767bad9fcf697bd1a3e624030840ba7ddc17d38090ddb140bed92ea52b49fe2e59924616ba1f54276aa3ff247b115bea38d SHA512 c56451baa52afbc736bea9da4febee59df32ab3170ff5581cbb9046947a29fcadf5e3f84021f77162310f592df1fed46ee21b85016d43d539ff30ece7dc3819e
+EBUILD B-Utils-0.270.0.ebuild 569 BLAKE2B 13baf948ba3cc603744618b6a0c5dbd7c8686f8c923e641cbc3cbb5385c741d671417b09964b71be9fbfa538cfade5cb8fe404cb322ef022490d6c73181c186f SHA512 80da6055cea348ea6a313eec994c3884258f948ca5e614ce3a9b37aa3d8b56c734f6e3a20064fb95c49eec9f0bfaf23e1a615de9c8eb7619995c0b8938b9862f
 MISC metadata.xml 516 BLAKE2B ce01b0c9312075c7a18827aa76d9d2a20a22fc5145b50613873bf41c823342861a2596f01d32afc2ec18b7e54f3fb8fa8198927e8af2165efbf18faee0e1e98f SHA512 56897978c780a0a89075476786016ed76832a25d724f88c0f99f209ca57c8785f3db65a9f13aeae8f9af57e8c13018d7c35d52f1dd744bd0fd12846c68bde53c
diff --git a/dev-perl/DBI/DBI-1.637.0.ebuild b/dev-perl/DBI/DBI-1.637.0.ebuild
index c0265546c597..d4babbe3a91d 100644
--- a/dev-perl/DBI/DBI-1.637.0.ebuild
+++ b/dev-perl/DBI/DBI-1.637.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module eutils
 DESCRIPTION="Database independent interface for Perl"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/DBI/Manifest b/dev-perl/DBI/Manifest
index 43da71faa201..001d97b750af 100644
--- a/dev-perl/DBI/Manifest
+++ b/dev-perl/DBI/Manifest
@@ -3,5 +3,5 @@ DIST DBI-1.636.tar.gz 595433 BLAKE2B 493e92137adf29d15edbde1f07df6a543bd11151449
 DIST DBI-1.637.tar.gz 596423 BLAKE2B fbd2100d302f5096d4c4f0808d753c0647504b6d56cae82050e02a3716969d9e5ed8c0a33c58fb860d60e65d164d58b1a81d55dc4e669d5276596b9e1480c7a4 SHA512 48002d77d40c40f0514d464a83f78255dc1a4c5ebb721fc18bcffa06d5f19ad7aec51084d5d8a032e37c6867b5f63176a9b11b5bdf08426f903b841139698240
 EBUILD DBI-1.634.0.ebuild 797 BLAKE2B 88c8b695da00c16174d346db89fca9b26e8902b90ced736c313becf1fb82d90e5f7ebfa081b9f7da40d5ba98edf9caad4dac3e320619dba2720410fb782321ca SHA512 d1cf35462d93f02e8e1b20fdec1c51fa27f40cca784a19487604daa1e2ee771073657d527ac4657c0e765943fbb636ea0e810ce11b1eac0038001597c5f0a231
 EBUILD DBI-1.636.0.ebuild 830 BLAKE2B d27feb35b900831b6c92b5208b73b334f62dfa92004b456827bf1014e5331c1e79650e9627a445502f4396cd4d240fef5e8a43f97401061c0dc2f6ea0108bad1 SHA512 70f41f045442cab1438bfd92fe439408c4bdb83a3dd4840ae5c61430342842962188dd88c54a6e8a179a559f1d5b220e8562b5af0e1cbea29a578c1efd993f52
-EBUILD DBI-1.637.0.ebuild 841 BLAKE2B 46631634b34b3aa49f7d05dff34a4c40dcf4b9530cf9f08492434b3d0b470000c151f2c3a7a8c3d0f5e0978ddde526da547cfc6d87a53966220d2a43c64a9cdf SHA512 036ccf70ce348ebd82f81ef3f3ff1e99df67c08e0e30d8304c4aefbece5052074f0ed2a8502d6c3b915fe5cf0c026e734a464d99db5f2b8347a2bfcaac33e10c
+EBUILD DBI-1.637.0.ebuild 838 BLAKE2B 1d5ad83569c1d0687e9c38c84812d3ae724fa454b2ea563cd3a843a09687d9a01bdb7364dd80d893b3a7d32c45264a1569329c184c8e510b3bee2bc4d02fcd5a SHA512 31f7879418d44d843293765e94eb7bf9885f7452327364a4490d6514ef5e88fd877a55ee9d65862627f1b1febbc04d35e1bf5c65d9d5a6eef547eb6bbf0abec7
 MISC metadata.xml 6189 BLAKE2B 757acfe005206196a3d5d601d04cd4ffbcd6de7eb35fbf14d3ec08e0adbb6526c51a0f0bd8ecbf3b5d7fcbddcfcf6d3fb3289b0d1ce3c5b346b20b080ed5ac1c SHA512 c6a65731db7bba5615e95729a66f72abfd37eeca78519023695adde39cd2e6ed6ed39cb68496144b0b9ac0919ae86cde1dd9431d82aed5ebcfd29736fd9397a8
diff --git a/dev-perl/IO-All/IO-All-0.870.0.ebuild b/dev-perl/IO-All/IO-All-0.870.0.ebuild
index a40de99f6ba0..3a81d023742c 100644
--- a/dev-perl/IO-All/IO-All-0.870.0.ebuild
+++ b/dev-perl/IO-All/IO-All-0.870.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="unified IO operations"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~sparc x86"
 IUSE=""
 
 # needs Scalar::Util
diff --git a/dev-perl/IO-All/Manifest b/dev-perl/IO-All/Manifest
index 5ee38169de6a..c269a8b05dd4 100644
--- a/dev-perl/IO-All/Manifest
+++ b/dev-perl/IO-All/Manifest
@@ -1,5 +1,5 @@
 DIST IO-All-0.86.tar.gz 78648 BLAKE2B fa3a9a6d8828b1de5990585c4b6178ff28844bc01845c3e42b56142340d9e4df400f54f6d2c35048bcfd0c338681dece6b906141c70c57ebacb1541a7d294da7 SHA512 3bf2f1caae19d10905d8c959b88e0ef43703b3cd0fb389060fd6a6a0bba4d6b24a92b8d2568f4bbfca6b7614270adb7131225a7b7f9394b26467bdb780a16a0e
 DIST IO-All-0.87.tar.gz 77819 BLAKE2B 7a02816bbca80465bd1f40317a97dffbcc52e92ef767aa9e38987b59e8b14bd1d1a0b77dbcc2e4defeb3d44a46fa749b111bdffdc3b3efdc4217e3e52e290280 SHA512 bd8cb6d44db51a9a140209223f016e48acd713ec03ced1b9c02933fd88c6363926635dae033b20905201b13e8186b8bcc3f428d4d85cd187fc68b777cd197267
 EBUILD IO-All-0.860.0.ebuild 429 BLAKE2B deffb4bda7b191cfd732d8a8bbde68267459cb668bca9b263024d64abf45889b29c29d641b436bbcd841395bcc529a286110a2ce91ff3834598fa9fa64df98b8 SHA512 82c28f009f9ac1850d852528b39dd3aa18f86e62b23bd519f10a37b50d142a67cc88396598d2224644b004ed101adf40b3164da4c8fb121897b978d920fb5584
-EBUILD IO-All-0.870.0.ebuild 404 BLAKE2B ed7d6c37e26f128655eb375b5b29215ca14ce47e62e465f8f59ddae49c6a60107676617e187e7660d25962cedf1a4e0edfbe03cdc3502deaf460f3eabccc8b31 SHA512 457d25551751d68fbbfa8a8af9d53ea7fc3f2b574b73e4ccd7170e12f5964c4d689e804398e678464e71dc10ac4d8e9c7bfe05f61d10cfb09a0bac5055428583
+EBUILD IO-All-0.870.0.ebuild 403 BLAKE2B c96695014d29ae996d36ef60b8f6255a86e60b2e1f412560becc110314739de7b0a0c283936a982acf42ee3ae2a91835a8649a6b39ef7b0dbee5525be8ee7a87 SHA512 43a1aa240388bfb5ca487a02d36a1580d0e8ccf664653aa658fb5108ea8bcbd16a92373b2fe0693907fb34fbc502445b677537e610c33042b5b8fec62e932d96
 MISC metadata.xml 1111 BLAKE2B 2b1e83f614fdfd4599c6d3e81367fd4ca4cb0988b1bbc06a7341c253d3bd1b7acaabace540c16802c1874ba2b4f85edec4c0df24da436a5b33aa6691055aa645 SHA512 bebf7616b2651f704d1f26fcbab1d555bd49984ab7dfe56dbc3214a8ad927f39283af51e7be5bc54094f83352eab855a2e5775945ef2fffb8e41503868e61abc
diff --git a/dev-perl/IO-Pager/IO-Pager-0.390.0.ebuild b/dev-perl/IO-Pager/IO-Pager-0.390.0.ebuild
index ddb4bbd62d30..e4c94dcd1211 100644
--- a/dev-perl/IO-Pager/IO-Pager-0.390.0.ebuild
+++ b/dev-perl/IO-Pager/IO-Pager-0.390.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Select a pager, optionally pipe it output if destination is a TTY"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/IO-Pager/Manifest b/dev-perl/IO-Pager/Manifest
index 6e8dc5e4cb39..e6267d1f95e3 100644
--- a/dev-perl/IO-Pager/Manifest
+++ b/dev-perl/IO-Pager/Manifest
@@ -2,5 +2,5 @@ AUX IO-Pager-0.390.0-no-dot-inc.patch 687 BLAKE2B 1de1e8b93eb02734a04fe533904b3d
 DIST IO-Pager-0.35.tgz 17298 BLAKE2B f0518b0d67806a10b1919d237ba4a264c0b41a05998c30b5d1cc36baaf9f5d19628147c322c5b6b82822a69c1d08b500059b0bcabd356591d4e0a0c9932e4dd8 SHA512 adfb9e7d65941115f3d6376996c3c41682079a02346e1cddda0df2bfa93d46a0deeea42a0109697dd327e19ebf9ed869adc2827f0ea9acf28c69885afa6cd962
 DIST IO-Pager-0.39.tgz 17552 BLAKE2B 8f3bf2b82523fd7d2ae5aa555eea8f709d91f50396397eaf04bc5f9476f753e2b68e8e5ce4c46064096218d2d1b7f91d45d21c112dde938879455f61f5618234 SHA512 165e6c5e93cdcd463eda0a0f0f713790959a788220e29bc77bb10ff59f8e1083d1dc01fc059f150f8cfb4de1d16eef04813430072ea33d9dc6f4acbd3287ce67
 EBUILD IO-Pager-0.350.0.ebuild 685 BLAKE2B b5d3b72d5209bda8dc55154c21f3ba768b110eabc4cce000869dd971b9c54e0ef7172ad48dc2e7f929461eda4058f84b203abd705a003520864544eb846a8ca8 SHA512 aff2f1482ce6e68043276c973e588b92732e0bd0087843c357f082399fe5cb54034fc0d613aea4db2bb552c1cd6c56845e7fe6ba7c3516a6d68a222266901252
-EBUILD IO-Pager-0.390.0.ebuild 652 BLAKE2B f57a99b77ec41a22145b13ec36889dc7469966ac026a725a43cc39efab1cbae413e2c9aed961e52a39d9950f30277c128fe4d340e106345121bd23b65719e35a SHA512 1218579f6840fbec5b7c363e142bddc9e6e47ab893a8f266e795029d009eac61e986c53c4fa02f8b8fdfb66ba260f325ff596c0c009f173ec811c0440d0dc8d6
+EBUILD IO-Pager-0.390.0.ebuild 651 BLAKE2B a456dcff81e305baf0691bea1b7661c8ce7a7b6aaca5912190b8809230a06df0ed16dd02e8b2778100e84d449423363059a8f417dbe2f33479af58f2e6a9d1a0 SHA512 c1fd53014662a4efc40c95413e8a55e64b34cec4efda3e670eb7cb3011316afbb400f32a731f2a8c74401e70f921bab81589e60b20f142b38323a7bcfe120cfa
 MISC metadata.xml 584 BLAKE2B 46d2c2594874a2def60db412452bb50f0c5a40b5910fba0f6d3686f3a7842b546becae91656bca06dbf49e7ef6c6cec1d879baa64f320d067ec4d7111ced3bae SHA512 06f4420648c0a977c373dc3a8582185153f6690d946b07acba08de0c159f806ccb9682ff94c7c35c9c52e71fbec7f72048737728d62fc729741de11d7f335358
diff --git a/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild b/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild
index caafc2e64dcd..df44a593dddd 100644
--- a/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild
+++ b/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Does your process have access to the web"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 # https://rt.cpan.org/Public/Bug/Display.html?id=112728
diff --git a/dev-perl/LWP-Online/Manifest b/dev-perl/LWP-Online/Manifest
index 43711f1543f0..d359f0c850e8 100644
--- a/dev-perl/LWP-Online/Manifest
+++ b/dev-perl/LWP-Online/Manifest
@@ -1,4 +1,4 @@
 AUX 1.08-no-network.patch 1029 BLAKE2B dcd74d51a01bdd61d7ac6ca89f9198c57141168907d51179fe7d4dfb461b3aaa725a0493e25ed807095bab5c7e0cc97b2ec5d49fc6afb01d924dcff1fec57e2f SHA512 1bedc7075021fcf7e8be1fbe972ce26f39af5ac2b46ccad96697ae05ac87f6bb8303e78c4c2b67f096ec22f39265a95ff5d86a64b13f9d364ae608593f0bc0a1
 DIST LWP-Online-1.08.tar.gz 32250 BLAKE2B 4696ef7d50498b5373bd52568afac5876aa7afbe41ca6fed0029274bc0b52e05b005179fa520a63c2e43e9ba78df0dc1e99a2011f4ff13915f2cad829e706064 SHA512 2b255f60ee6521757ce3d49cc0720e3985ff17e3db7b7868ced6a9e1c5444dc067c80b7d34dbe7be9679c134f3de1dbe0e9421a1a20ff388c812aacd1d964497
-EBUILD LWP-Online-1.80.0-r2.ebuild 851 BLAKE2B f6f65e481510082bab8ac7443837b4a6aafa6854cfea65001a6dedad582396c9c4c6bd1ea818bca23792be2d883bd529daa8d1cec421f962da3d55629cc0fba8 SHA512 830e1406a48cb874ab652caa0bbd3e4b70917147640dd2f82204babcf85c3984a7520e3aa3270788e6090bb0f6942d433129f5d407e34c3048a0669b9eacd65e
+EBUILD LWP-Online-1.80.0-r2.ebuild 848 BLAKE2B 533530eb7a756b96b68957b051633e625fe6d0d0b22e190c21a4d8065989372d166b525459a909b6b2a8db373f126517caf11cfcd58ce19a5207df4ebf147b1e SHA512 4d4ae0567fee8d91c2eacc71ec7e80eb586d34ad55b7c411e4bfd81bc9ae23889c651cbcba51ab86d8a57a2c7c13825ebe8cd0c944462564e87a8317cef57a5f
 MISC metadata.xml 506 BLAKE2B 8946eac364e58e9d3965e0baa455a1b09fa28a77a6b021c52ce9fe168f172591142f2ff69a8a0988adaa6fb2b1e6ed63b428e8d5e4262628dc0b76583a55d859 SHA512 d8ba13433a74f5ce01cbf7f8813d5694ccafdd1eb5e6eb52aa37e5e5ead36063c782e777c791cc740850e69af6543b2122d7e714afa173b1748a9d40861ec7d4
diff --git a/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.11.0.ebuild b/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.11.0.ebuild
index dd755e3e1283..67c16bfdb4b1 100644
--- a/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.11.0.ebuild
+++ b/dev-perl/Lexical-SealRequireHints/Lexical-SealRequireHints-0.11.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Prevent leakage of lexical hints"
 
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc x86"
+KEYWORDS="~amd64 ~hppa ppc x86"
 IUSE="test"
 
 # Note: This module is a no-op at runtime since Perl 5.12
diff --git a/dev-perl/Lexical-SealRequireHints/Manifest b/dev-perl/Lexical-SealRequireHints/Manifest
index 0e94a1866d10..f076f3688024 100644
--- a/dev-perl/Lexical-SealRequireHints/Manifest
+++ b/dev-perl/Lexical-SealRequireHints/Manifest
@@ -2,6 +2,6 @@ DIST Lexical-SealRequireHints-0.009.tar.gz 20857 BLAKE2B eb52f1f87e8e0254c75122e
 DIST Lexical-SealRequireHints-0.010.tar.gz 20903 BLAKE2B 03a5d861f131c7031acf6e35b01b3f971562930e4892d778677e1b21b9a322b6c04a5a6baaa9e45545fa03d36c3130e31ef0e9d2fcf0390421a93c9bed8d02ce SHA512 4c71a22397ae689349bf45c1b2177108008158052b341f9d9b09e5d97c55cd538bb427c041389c4edf8584be292bf4b1f42abdff573510a0a64fb69e5166aecd
 DIST Lexical-SealRequireHints-0.011.tar.gz 20649 BLAKE2B b95d6c03c9f85de34b594a09b22713467746e52340ce752c0a4b2ab4268a7b3df057a1e769b38a6562b48eb566389fc162873960a73d28507051e72d28621f1d SHA512 b31d3527e3ea1d28ebcac58cfdb35893643c7c371dba96cf06509cc7b1ce61c38f6cc37f420c2ec93b0a57adfc3d3cd797af97fad9aeb6e1000ef1769e26c31e
 EBUILD Lexical-SealRequireHints-0.10.0.ebuild 595 BLAKE2B 8652e659d815f775dd9c70c4c41355e034d4c9188475ccdbe55853faad925a3734afc123ccbb62637c85f3c81d8b2f71a2eb4eba371925a08b8decb9e569a1f5 SHA512 6f989295a5a0c6fdbf1396bb71da7118d90319065705bcbbe0e6aea45379f2bd624497e4ee7fcdeff05eca2ec3dd53c385a7b14904145914450f37eaf6143435
-EBUILD Lexical-SealRequireHints-0.11.0.ebuild 598 BLAKE2B 1321750aed7e7aabd3cee11c9cb485c4cd489e63f4e61152a533500719cf2ca2e27565f35831f314703a37fd4e8bd7d8889ae99e9c7b4d95d017ab77ec15e9e7 SHA512 1b454ff2550a75c1375b91121fbf612dad615ec8a7156d49ffad1c57826d395e2584db8a93b1c4e0ea4a5800c5551dedb7a7362eb4138432806eac0dc14ebec1
+EBUILD Lexical-SealRequireHints-0.11.0.ebuild 597 BLAKE2B f1e253bdb94d26a5f2e074376ae8d001abc068607460ac3cd4c496ddae1f6235a6f9538fe59c2324b378bf9e90542543245f54cd6ee9b1c81f6a7d1479cca92f SHA512 215b0dadc467250e2782727df9bbd406a3a3e80d300ed7ba01b8139c1ad304050bacae19bf3724443a3ad64fecb4f30453d5d30dabea595ea2cfc000f0668211
 EBUILD Lexical-SealRequireHints-0.9.0.ebuild 435 BLAKE2B fb004b90330c0f7dce08540beee90788c7af6d5d92b9bac550defca0b01de8385167adb8380cda840f87bbf9342cc3da91b270000e43e09ed733eee7152c1405 SHA512 5720897ee99042b0a4013283ec7b760a0973b9d399658cb078b9cfd03068092439250285757a65767159d8434479ef0284acdd14f1c6253959108208b5624665
 MISC metadata.xml 420 BLAKE2B 64b6e4cf7a687278b3ff304184ef846a2822f46edb06f6489d29ccca791f858f635f3b94320f45acbf2dd29fe9f3c59e770c1c4544033e0f8cdb4008bfd26f43 SHA512 5ac0a4033b8d78fa425532735ce04caad6ab864b44d1d672120f2bf7ad3398f382662e36217265521718e99c4de9810e848cffb9b5579c6cedda2b90c73b3426
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 2cefc57ee1b6..05fcf611482f 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Module-Info/Manifest b/dev-perl/Module-Info/Manifest
index 3170e9841859..27d6a019417e 100644
--- a/dev-perl/Module-Info/Manifest
+++ b/dev-perl/Module-Info/Manifest
@@ -2,5 +2,5 @@ AUX Module-Info-0.370.0-no-dot-inc.patch 1712 BLAKE2B 12fe239524234df13130fab8f6
 DIST Module-Info-0.35.tar.gz 55112 BLAKE2B 2daea2eebc46244e8f5b145313256c3bf1f9294a40d2d2ed7cd4dfb835d267316a47e90a945c980404faa820f807a7fc9205ce9300bfe6ecf89ff5e49baf8c1f SHA512 87d68f575f97db8579675a8187cf746e74409266c0ac9454ad41380e6e0ee9566632d368098c0b00b54128aacb27bc43c774ea78a047964bb6a14f6a06c681aa
 DIST Module-Info-0.37.tar.gz 42864 BLAKE2B 63d41a5d54201a62bb98cc4b40f03bfef3173a26282561972aae8b5d54d4d4a1e6fa9359d35d76a420edef8553fb5ade4bf4b52889686131bd19d22035f95e89 SHA512 4a9fb295c6a0b7ac701543b292804ce880129b883da7d8f27b255a198e28dc105b11753330c2861241e65898f726a1127c7daf46af09361e3713bdcd5b89227e
 EBUILD Module-Info-0.350.0-r1.ebuild 440 BLAKE2B 9a3ac23ed64c1f0401567b5193ab24ba353a206c05b846817858e00537dfe8a1d81753e85bfa11535ebf6a207de2f7fe8c70c15dd329cf1ffe51cf9506cec169 SHA512 8ee2bd60b51563ddb027bcbd745412887ec29a8d7a7d0913d5e017c1d913a810d29781c8f1ccf409832f34d8d08fc4612a7bc31fd13e2616b4564c22ac49b1d1
-EBUILD Module-Info-0.370.0-r1.ebuild 583 BLAKE2B 1484a4ec979f3d00897f5a21c4401877ad61848f2c3665b96ac763351089d0b370ca00590e049e48276ef7b75d0ac33a42d86b23315976f2fdea5a54be7ac686 SHA512 932e9cef97cad877bd3a0bf8b7812c00e1a3f8bb7cb8b8fe1ef0f029ca6fddd541cf07c54c9fdc0d86b1770c7cff1da5b981e5fe84ba3071bc9838d2af4c4a0a
+EBUILD Module-Info-0.370.0-r1.ebuild 581 BLAKE2B 67c6fbeb8f342686aada147a9c0750f9b8dfea10ff7ef0332421959184a1b8b4dd0625728c08940bb611d4c1ca79e46e5ed08d31bf4e2958f7683637951877f7 SHA512 2402833d8c3f972ba34ed1ce9993e26f74366aa807f3fd9a5e8b7a26aafd5e1ea5758fabe11b86a4b1fbe7c7acfa3d84f26f391cf089e5f186fa80e97eebba4b
 MISC metadata.xml 657 BLAKE2B d33b4d78a2660a458673a0769654da2033d8d83fb249e7a0bd31fa92563d36885b2b2bc0707e6c3a3a98059896f7e931874d60939caa444bee0245f8005f05a8 SHA512 7cc7f77e2a7946fcf3bfe2fb5cf9ec7c566cb78d869d68042d674edad9bbe741206d41af65e9535bcc8f8586dbd9daacda47622cf87d86c151b87f4e556930a7
diff --git a/dev-perl/Module-Info/Module-Info-0.370.0-r1.ebuild b/dev-perl/Module-Info/Module-Info-0.370.0-r1.ebuild
index a01a50d5ced5..f96fb96c91d6 100644
--- a/dev-perl/Module-Info/Module-Info-0.370.0-r1.ebuild
+++ b/dev-perl/Module-Info/Module-Info-0.370.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Information about Perl modules"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc ppc64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Module-Runtime/Manifest b/dev-perl/Module-Runtime/Manifest
index 296435d04538..0680ad4fe5d9 100644
--- a/dev-perl/Module-Runtime/Manifest
+++ b/dev-perl/Module-Runtime/Manifest
@@ -1,5 +1,5 @@
 DIST Module-Runtime-0.014.tar.gz 17396 BLAKE2B b62636aaf0c3f05e7e99079409292d66cbb56f04ecb7b310e2351e89c952044a2a039a7134e1411ff96d4729ca8da835ed02cc8ad4d139ec5f1db52eb78b3bac SHA512 5431d9aeb092bb357bafed4e4cf216e9eda4bbbdd0c27547a1729adbb2f6f5a114ac25580a814f2d07844d6b742b9df3ca8d5972668bcacab2f791d617c1d32b
 DIST Module-Runtime-0.016.tar.gz 18275 BLAKE2B c8b3d71deb7cff7817fb154c3b2d88eee79f56d10bdee0d41b880097dcec72a7eb0dc9db4b760d09463b3ff78139e1cd3b5bf3b1f0005d1e044e1858028832cf SHA512 64a362ee897646173dbbdd8794f863d93379d45d7ac20d3ae890d77b4ec3f5e36aaff66c41b4a6a33b28bf492216283528755550ab09e466ceafb4f0cfbaeb9e
 EBUILD Module-Runtime-0.14.0.ebuild 601 BLAKE2B e58c5a228707dad7784af15ddd94436f0d449bc5c7ec16956a856844d779fb4b9707eeb9a76250f4d97fc673eb5bd9b9361f329cb86ef29d05e94548e62d80f8 SHA512 a18777f7ed1b9c97a0e5b29b40b8382c221b7ab75b27eaa88c44762cd1db92cd56fca224dc013a44a37d419b362a1c870befc97d9ddd84b00851363b730e9e55
-EBUILD Module-Runtime-0.16.0.ebuild 589 BLAKE2B 61d3deb723374093bd16689834fda3ed5c0c6abeb9017a7cdcad36c756d426e5eebaa31162e3a0d07a9fed2f6c8dc5dbd3f5d063471bb661bfd2f8da242f2309 SHA512 e5e811a53d0ae2017a0b254d136c999ac391ef9d8adff3a95112c63c7ed4ccc94cb85cb75881497747b59e4a1fb245ac91ef3b027d023d20644442aa4c91b856
+EBUILD Module-Runtime-0.16.0.ebuild 586 BLAKE2B 111c705c0cb24e8c6eb6faccc750d167e81b5e081e2ce468446f9bb23c2ee4d3215adcee40f680d969ca262850ac545bae76e8e8d33b90ed703cffbfb0512328 SHA512 bbed9eaec3515b0062f7ab36153525c49986bb2095db2718ac4bab62b1a8e3efeba587ddd86ff29cb3d3743013fdcef5cc0d47eb54014418614f027b5f68e484
 MISC metadata.xml 424 BLAKE2B f46423f84511442d70c4f2ff264e6f901ea40badd762c37c047d0e7568afa1fb6ecee6ba3a790f7963c99a5421dfc59d74a7e1ed067f13afbf8b746d9d6d654a SHA512 99a0a6e1014cb85c49d4e1131f808d0ad362c0627cfe1a21116b4fc75462ed67d16e0069714f38a8cf52f1ac2366fae192d99d9139b8ece470e12e71800ab4e5
diff --git a/dev-perl/Module-Runtime/Module-Runtime-0.16.0.ebuild b/dev-perl/Module-Runtime/Module-Runtime-0.16.0.ebuild
index b9ae293c33e4..25977d7f6b9d 100644
--- a/dev-perl/Module-Runtime/Module-Runtime-0.16.0.ebuild
+++ b/dev-perl/Module-Runtime/Module-Runtime-0.16.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Runtime module handling"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/MusicBrainz-DiscID/Manifest b/dev-perl/MusicBrainz-DiscID/Manifest
index 28f7dd766db3..57ec2d45a950 100644
--- a/dev-perl/MusicBrainz-DiscID/Manifest
+++ b/dev-perl/MusicBrainz-DiscID/Manifest
@@ -2,5 +2,5 @@ DIST MusicBrainz-DiscID-0.03.tar.gz 5343 BLAKE2B 3891c41a97417a68500351f3880032b
 DIST MusicBrainz-DiscID-0.04.tar.gz 6907 BLAKE2B 1dc163515af1818816d223da5090dec67cf1102311370de0658d15488d5551207b27f8b817727f3ddad2a64f3f792cf1e094ace460fd3db7d4eb1b06fdeea18d SHA512 ccf93205f3485fa19e22cee079b2615326384513dc773f5d242216b680317d2d35d3a2421e46bc17651d8d7797a4d01bd3c2c0ae603a1d1e550ac2a558163125
 DIST MusicBrainz-DiscID-0.30.0-patch.tar.bz2 412 BLAKE2B 6371693ee495ef40300cca7f88f285ba6485ac61e828551470342fceb85a4ef1ef8ed99afbff179f274325ad0299686db62dc3e8ef5337b85addd2f7c1ccb458 SHA512 79163ba28285676f585af2be0a12a6210a8869c57cad5bba1ec42121f9e1dc351ac2f51b9a702133a71fbaf1d3207e8ea153564f838ffc5d39b60268af7bf726
 EBUILD MusicBrainz-DiscID-0.30.0-r1.ebuild 1096 BLAKE2B 838964e1992cb74076ea8081cf84a3a316e1074acd97fd71a308a77058c4aae5d8eb4fc86b0d6e966d6aa6b0b4da1d7b68d57786580fa86cafc5effef6b4c25a SHA512 9903a29e4ebe6a8148cc10385069f46773842516000ff32588db9299641038821376d6541a4632641d9cb6af127b094d205c2b00c765dd61dd079b29ca87ac74
-EBUILD MusicBrainz-DiscID-0.40.0.ebuild 582 BLAKE2B e5f73da2a513b935af4976cc3251eace2beb3b867cc041ec03982c0e6fed74d2728b03130051e18ccb36a63413d34b43049e7e2b7721bf3e3a76912492cd4e73 SHA512 407bbcca42a2c8d83031477d4d19ec41ceda628d14433a5645ec143e1b81e3d2f42cdc7465babaec228d55824ff349dbe841540a29e89b5a9e575eb765acd64e
+EBUILD MusicBrainz-DiscID-0.40.0.ebuild 580 BLAKE2B 05a00ca386601c1f6f1e68b77a786f8d218cea33f2073595942b6137aebf8c2e79076b65cecbd42dcb60079c42f1152ec2b36985288c61e821f5e928a96483c1 SHA512 a78b4ccd48f595f54add57a840d9902ab8bd7ef5c4933fb586192aad0a93bba45339a78189555c732cf6bd549a74777308727a795c3ddc69d189bc553a94cb2e
 MISC metadata.xml 492 BLAKE2B 3ea020fcec3b8e63b6682663083245bab92cd839225445a54846848c437633863da5e8daaf198568223cf92e316aed6e1ef42fdefc0c30576cb51a1733768de5 SHA512 5afc9a1138a6390f984ad75a34134c3d2eecb0d72ef663d51987d822945f40f6d756fce4efeb1bca1e44003bf837ba50d77dc91d3f37f3b03bf3cd69ef2989f7
diff --git a/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.40.0.ebuild b/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.40.0.ebuild
index 6776a959199d..d17681df6e9a 100644
--- a/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.40.0.ebuild
+++ b/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.40.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl interface for the MusicBrainz libdiscid library"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ppc ppc64 x86"
 IUSE="test"
 
 RDEPEND=">=media-libs/libdiscid-0.2.2"
diff --git a/dev-perl/Net-Daemon/Manifest b/dev-perl/Net-Daemon/Manifest
index be6f31ad59e0..90e2fe2bff81 100644
--- a/dev-perl/Net-Daemon/Manifest
+++ b/dev-perl/Net-Daemon/Manifest
@@ -1,5 +1,5 @@
 AUX Net-Daemon-0.480.0-perl526.patch 941 BLAKE2B 04ef7335f9ddf52c4ddb3f0e3d9b0ec37306af001541299cf12888097d1985e9f5ab61f268ac5522a1ed826cfd7c7570cd1c7798810fd1403761ac95935f32ea SHA512 5ddd7f00a608481ac63a53c7856ad8cb58b5dd61529ccbf2739e921c491a73098e32ef6408bfaed69891dadeb820a57dce406a773c23f4b78e6396ff801a32a3
 DIST Net-Daemon-0.48.tar.gz 29513 BLAKE2B a5fe8eeb01a463ebfd7b274dea2d0b9a8e633588e35576ad24b5e40a4b06ff5f1321bc01bbfb63ceac8d8e5c9e85d15807dde3c5cb18b21e53da6d84ca24a999 SHA512 85bc280adc0de6be8ebd64771732f83299018edd06441cf96c438914a16c3805918805cde07bae4fe92caa86475ad35cabfc1edfccff117dcce7f5dc8b137bba
 EBUILD Net-Daemon-0.480.0-r1.ebuild 499 BLAKE2B 6b6a66a3d24833bf3865fabe2eedb490c9b8b2f001f9398b2c70e53c772998ca5b70d9d12fba6930831fd302482887a0845f5ac4f56e3272b7e3439f30b90fcf SHA512 9bf797c0bc838d548b3ee55625ee30ad295e669988ded651c65271c7edc9c70740dc403e4537305467e856b7c2fb099a51161933430bdcdc3641f2a82f249458
-EBUILD Net-Daemon-0.480.0-r2.ebuild 649 BLAKE2B 8ec5a08d619a25da89ed8536fd944768ed499b80b081207a03a4b1925a7ebd797e82561752456f48ffe48aa410419626199854c9d6e1a033935bcd20094504f4 SHA512 c6c065d89a4f4ebac0f91d04b4d5d178a1c15418baefdbe86e55ffd82d8022115365243fd0dbbdcbba0cd3c53a4a866c980ceec5c022b00a768909098a1c29fd
+EBUILD Net-Daemon-0.480.0-r2.ebuild 646 BLAKE2B c25c8ca68abecd24ab2ef5913cc85971dd2a18528035116582fcd9f684a44cbeb52c3f17929e20d769bb20bc50e32c2a5fcaa177ab3dd9afe9220b3124174c85 SHA512 383d4314b55f869a58d7e04209dfad2dbb42081ab632825fbdc1cafcc6914e82a9d5850e27cc5a4878031ba8916046719691aeee85b4de435ca67197153e754e
 MISC metadata.xml 660 BLAKE2B 89b846cf8d8e9eefa29886106ee0708ed034e7135f43c621e76d25f860c36c34dffc5348a9af7badf3114e93e331596f93113b8d1a8f09586f29630440d5f735 SHA512 abb2535a1bed81484e691e65d2282bcd2243ba65d5b7d09592397a88e32a98bb255e1b822ba91e0fe4109be6aa7d7036af2db731d8119ebeabbeae5e4e9d78e2
diff --git a/dev-perl/Net-Daemon/Net-Daemon-0.480.0-r2.ebuild b/dev-perl/Net-Daemon/Net-Daemon-0.480.0-r2.ebuild
index 2aab8dbfc46d..c458fa0440a6 100644
--- a/dev-perl/Net-Daemon/Net-Daemon-0.480.0-r2.ebuild
+++ b/dev-perl/Net-Daemon/Net-Daemon-0.480.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Abstract base class for portable servers"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 PATCHES=(
 	"${FILESDIR}/${P}-perl526.patch"
diff --git a/dev-perl/Net-SSLeay/Manifest b/dev-perl/Net-SSLeay/Manifest
index 826d8bb7c7f2..90d059f9a6ae 100644
--- a/dev-perl/Net-SSLeay/Manifest
+++ b/dev-perl/Net-SSLeay/Manifest
@@ -6,5 +6,5 @@ AUX Net-SSLeay-1.82-respect-cflags.patch 902 BLAKE2B e95a0c49ba70d820ff419a2ef7f
 DIST Net-SSLeay-1.81.tar.gz 396631 BLAKE2B dfd0f14bbeb3196009d7e597c0c933dbe9cb7f9d4591ae62adc94a94d1b67d6e108992c7053defcea9b0c6dad90be3b26c1d53cea9e87a09016964d09fe2c5bd SHA512 8d4b72ede74ea22cf2ed681a8441f40965331cd5d4442c19677cf5bc7c1e61ed1e50d0f3a4f1b272428485bcc132ec99b0c75344ca43e8a34a9dd15539719f55
 DIST Net-SSLeay-1.82.tar.gz 399194 BLAKE2B 0c8aeb3085b102b71284266904ee88a8558070644aaa6dd0c5f78db0bfccb0e7456c8ba62a549d7ab245a02ddc7e856bc326d503f63268ee0761290e41b97e4d SHA512 758c41f4916a55b5085167e5c6a2732a5ee70dbeb8f42e791cd957957ba4a59f724c072d3fa50a6b42ae3b22cf3ecb8738c3f8963990a7030117b73c2dcc0716
 EBUILD Net-SSLeay-1.810.0.ebuild 1522 BLAKE2B 7bc2b3b63caca3ba9b6c9583ff2cf845b5e957cf318380f7af5cc2501d297123577a71c350b8ba2eae9ca321430560990f91a9b4e589c56fa66ce34f8a994c2c SHA512 36e994c8445ab80c13fb337edf27963d7368edb6314893679cf37a3682714ab4b51899beb89d348cdbf2df4b0d19f2e881021c8d344ba8cef04a97b4954df773
-EBUILD Net-SSLeay-1.820.0.ebuild 1562 BLAKE2B 3c2625c97a12bd7eaf50fa1b24f95bbc4f695877f6d4d1f6504ae26d2443131a1dd109e1fdc6f4681ebe0b3e6f3f302cab3e61dc87c66bccc60b264ee1d3dd46 SHA512 dbf93eb6dd0fb5e630b15f71d4ff33c1ed1de0a1717890488889cbbf6bace775e03cf4392d9e41233d05c85ce670882b61948e8269e80467b207e964f7b75dfc
+EBUILD Net-SSLeay-1.820.0.ebuild 1559 BLAKE2B e1109df56a8ac438245fb2dc829eaa1f8a08e000b4deb31e8de42a26d8b47947344dd61c92fffc91dd8b5ac88695e4ab6b85b3b5865d1ff684dc008f3ac9badb SHA512 ce77f7d156b0719052bea222f166ce623ee958641640364fd6524b080a54832b80fa5838baf6faa7a0a92663b87b82b73aa0abe48b6e9504c6a162a0a14cac13
 MISC metadata.xml 458 BLAKE2B a1f463c2ae637ac0ce9708d85768747073cb613831fad5454e72801618889ce2a96a5b6393aa06df0d0a34a05ef3ddb3aaad00fa1647ec8bde8a5aa1b65a6e90 SHA512 1502d6c58c7345b12fca3555c3bde82403f0a7bdff6d253a31c4b5b82bc981127fb2bab9e03d47d50963c3cf70533ec8ceebc025b71fe9127bdc294f092d955b
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.820.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.820.0.ebuild
index 181d7efebef8..6700ae6edd0b 100644
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.820.0.ebuild
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.820.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl extension for using OpenSSL"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libressl test minimal examples"
 
 RDEPEND="
diff --git a/dev-perl/Net-Server/Manifest b/dev-perl/Net-Server/Manifest
index 2a82329be315..d9c13fa72762 100644
--- a/dev-perl/Net-Server/Manifest
+++ b/dev-perl/Net-Server/Manifest
@@ -1,5 +1,5 @@
 DIST Net-Server-2.008.tar.gz 119565 BLAKE2B 02566238140f07d8ce1eb4aee19ea486ec90f0fc5d3aac73a2b19c9b1c91d149b3a079ebbcb0b0bb2d69b7c97e31af2c2e0174a105fbbe4c7af2aeafc14cebdf SHA512 cbc7697f598db10931a10701a23aa5e98a6eba377bbc6c17d3d77baf26e0e83cf4e9c163e954faca3d3145b33264fd5a10cc2f7c6e219a7d6425ed3cc73f254a
 DIST Net-Server-2.009.tar.gz 146781 BLAKE2B 64c0040790531dd79740bb320223e6a0e1dae07fabeeeedf8e91da523701020a8f5f7c798868d5451a022f2ef53e3fce927e5389b0ca669f01ca6de9b1d780f4 SHA512 36409f8d2478877c68cbfcbe9c08045b0c24a926b64f022faf3de8f4b4369ff417d5c41ff1e9800553c38da29c6d72ef301119c956cb26439f6b6366ff4b459c
 EBUILD Net-Server-2.8.0.ebuild 440 BLAKE2B 5109dd3c73479ad3c483cce4ef68bf630ef104202add05dfd69c80c433a8345db67f5422f5c7095b410ec4326fe14d1860571925ca8681162e21a9d9ad35b327 SHA512 161fbade8aaf8c74c0744d283dcaa79e7829c85485ccd6cd38be28180b874397ee6cc760a81eb2394d89224393489ac5e7e11c39db9fdf43feb282ed73f0f046
-EBUILD Net-Server-2.9.0.ebuild 538 BLAKE2B 1261858c426e16e84809894c754a859b9ac2afe02272e4d4eb7731cc92d6c8553e5fa1ee730c9c5106a231a13bfef5d2837c761fcef9f679c79281dc411f23f5 SHA512 db64031f14ab968ceeff33b1b24797848ee159fe4cae5aea0dfb0df6685c4d144f2d577d89648dad017684e010eb4495c6b558b406e2423c344c99c2d3f6f4c8
+EBUILD Net-Server-2.9.0.ebuild 535 BLAKE2B 538c2dd3bb961edfd76d03bb1213066c0c99c966e5e03c844c77d9d2ef41cc800b16d305335fce609c4c081e7122dee8779b3684404d3d1bb50b5bf4cf8b9e5e SHA512 c73bfc22cded189c012ba77056894912d6d41e037e0f4c2655fd0d4c1642a2ddcc38d482c1cf6a671120ec263012f81a12533e2c7bcb8c21098dd77ebd10e475
 MISC metadata.xml 1989 BLAKE2B 86de38764702f73faaaef141c87d38b424183676402d77618940f0cc3e9f8f7a435d19c8430877c64c0fc924a2c0d2f1e46a153789b65fb40fc2c424fdf39666 SHA512 547744a9e859be23a32c7776267bd5bfea1e8333e46c09ab2d80061b70df1a7becd26866a219ed5fc201bd5be0374f5e46041361afc4be2c25e9c39db5baafcd
diff --git a/dev-perl/Net-Server/Net-Server-2.9.0.ebuild b/dev-perl/Net-Server/Net-Server-2.9.0.ebuild
index 5ca0e9ad426d..5d4d05169f7e 100644
--- a/dev-perl/Net-Server/Net-Server-2.9.0.ebuild
+++ b/dev-perl/Net-Server/Net-Server-2.9.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module eutils
 DESCRIPTION="Extensible, general Perl server engine"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="ipv6"
 
 RDEPEND="
diff --git a/dev-perl/Net-XMPP/Manifest b/dev-perl/Net-XMPP/Manifest
index 5c1738c042f7..f9b847ee900d 100644
--- a/dev-perl/Net-XMPP/Manifest
+++ b/dev-perl/Net-XMPP/Manifest
@@ -4,5 +4,5 @@ AUX 1.05-no-network-tests.patch 1569 BLAKE2B 68d736865c0f727c03b64ef1dc8654a903f
 DIST Net-XMPP-1.02.tar.gz 121653 BLAKE2B 70b9ec321740e2d4076fc22ff8860092e3831c0e1fe15c3ec0008bc2a22b4d2c1d1f226d72c204390fe5740174b290bed9ef4c8396e6a9380f90bcef8f04600e SHA512 7a373e627de7e909ef50d6525b438dd7f094c7e6ad3cb66fff6087048fe9b127e376cf45d1621e55deec2c59fe043ff19f180d0b264fa1dd0c392701dfc43497
 DIST Net-XMPP-1.05.tar.gz 103876 BLAKE2B 5ddc98125b26518c59aa4ab39a974b9cbf1575bd59bb66d5329a43e1d5c3d150f34cc93f545f2cd56846e7b4e46142c47aff7da9b279181a02a57bf95ff1757b SHA512 cdd5474fcbdf7ff6c7d1247f9828f5dfb1828c258af366a831bab8e5faab423b73aa16c34228818526ebcc3180ef0ccc52d6e6cb61e2fe689458b87ec7fab699
 EBUILD Net-XMPP-1.20.0-r1.ebuild 865 BLAKE2B c07fc635aae1a08efb3cf10cb50fd284cb8906316842d3f2d5041d80a712d378616a3c1625091c9640ed198c355f45a670640d6328c23ddd8e0f35aeb1cdead9 SHA512 91f46ab81ee85801eae1f83fd8216309a82fff77ed69f0e7058d21a5b4bedcb630e9c69eaf2998af99414b0abc2b3c876f2a0b1d219af92a484ace5e6b5100a3
-EBUILD Net-XMPP-1.50.0.ebuild 759 BLAKE2B 50c9ded07864b3ec3f76b02b4573d009944c21ab92e88a54d2671b63ffe42f2798cdad99d25d4e9ab558541d57b073706bec03fdc4b68455efc91fd58ad7f295 SHA512 c36352d67d9c50f767c6bb3ec583cc00909e441352d8a1f68571991f9bf27c59eb2fe451893df475fc8cb5d2c5cd948e21e3ff8c7f9f4c5e8707e8ad1b780a5e
+EBUILD Net-XMPP-1.50.0.ebuild 756 BLAKE2B 089c0adc049fa797fa6c597747d9cea28ae94849c79f71af33acb19402bacc3d180d02da6a6550db6c389fee4b777753bdb2142005582d1859b1c424a5710480 SHA512 16369df7b381b3e841b83049966cfc342c63bd3d0f35b3aaa42bcafe7f0dc7319fbf066d7b3ae1e7da6f67f0d6ce4c165f35f6da7561534b41d81446a8e48058
 MISC metadata.xml 1305 BLAKE2B 2ec03661e185b80764b28cce46f08bef4817cd3c1b2244b8222c1f5eb507afd77e143d7605b38cdf221639b8b1f13a959bf42dfce3da0cb0857e3112913f74f8 SHA512 4a016ed35a0d553609a3ce69b71095c00064f39a1960dad6bf53da42d3d9e65ee4fa7256128b5af2ca40779a69b28ea02286b6b0427a9692639fa8575c9068bd
diff --git a/dev-perl/Net-XMPP/Net-XMPP-1.50.0.ebuild b/dev-perl/Net-XMPP/Net-XMPP-1.50.0.ebuild
index 56d4db8b0d3a..789bb06dfb89 100644
--- a/dev-perl/Net-XMPP/Net-XMPP-1.50.0.ebuild
+++ b/dev-perl/Net-XMPP/Net-XMPP-1.50.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="XMPP Perl Library"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index baf58cc6d283..71880492dcea 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/neovim-python-client/Manifest b/dev-python/neovim-python-client/Manifest
index 5eb00e4df69c..059c72775b12 100644
--- a/dev-python/neovim-python-client/Manifest
+++ b/dev-python/neovim-python-client/Manifest
@@ -1,7 +1,7 @@
 DIST neovim-python-client-0.1.13.tar.gz 41413 BLAKE2B 819c3e7763cfb357d45130928dab23ad149a5f9d8efb0df8699a805bc394662447837ad3edc869705a95d74a37f2eec4f155212da918ac779d389c150a0d7189 SHA512 ecef42601632551c98f8de019bfdf4dbff3ce1f0e1b6943b78a506b710e5810f6a7e611adc09435992b97288ff365a416870a74202a5c68236b5daeb51d15c8b
 DIST neovim-python-client-0.1.9.tar.gz 40599 BLAKE2B 48b43d344ed0c7aa3faa95a16c9714f2d105a916364db55d68263db7b8307a90d084bcf7559dd17277bb8dfbe6d7bbab8d3dafa250b4825b2cebddc00d130dee SHA512 043429407d140b37004d5344f9244c8cb5a37e2b5d450454e6535bece7fb05f037e5eff2a63431fad55ab2470372c4a17e0a608a94af65a2f400f2158b736ce4
 DIST neovim-python-client-0.2.0.tar.gz 41892 BLAKE2B 0ae59548ae1e376c618c24edfa73f3f68f5c059b2772be8ba3aae08d38c7a368d8b341da0221092ec8fb132843e1ea2d313bedf0c51fd202d5953e530f205d3a SHA512 b8363be2892f4dfaed0251186a3f370ec31be51710b659b71f52575da773e254b388afec2f5999a6b526d722b5232a16c59d7e28e49df30b4760ef030238d068
-EBUILD neovim-python-client-0.1.13.ebuild 831 BLAKE2B ad09ed46b91a3863d826ee34e761b120bd9b0ef3a8f68789bc765f81d93d61226ad46eaaaf748b060c1b7722306c20253115fd2a0395b1e23524247ae643d799 SHA512 33fc3afb3c9a748b186b9fc0500ce52aa438cc39016d0eadc2be78161dd41db39864aee88fb59f36b8880785dc3d40e8a6a079d0905a3a609d1b99c624a17526
-EBUILD neovim-python-client-0.1.9.ebuild 674 BLAKE2B 24246f34b51ef8eab9d1c55a6902f4f2e7d56e345117a9211d97c6af35e9c38f9eb503ee77747f5095215e8e07ba66366fe378f34e82acaf89eb3fb151e7357a SHA512 77c3f9e42e9f45ebdb3d9341e3305bd86366ccdd7451c416095920d973743e68b3d0ec8d5ea80c2553e2685ce4e622eca637f841373c47ccab5a74c8ad649b5e
-EBUILD neovim-python-client-0.2.0.ebuild 664 BLAKE2B c504d9fad2292855dd4ce10bb8432a90d87484a749c754af539371da60d86fcaa2c509b6757f8688bc1cc894b6ec9ace72c4d8247f130937144b380572d37cf0 SHA512 ae889e4577b14ad4d7664f319763847071705f6b938669678ec63568a9e27074127a3d3b0a79463987e502092d3015d18a7fe35c6ce723b2ccf54464ed079760
+EBUILD neovim-python-client-0.1.13.ebuild 828 BLAKE2B 2e50b899049660e8ccc4df26221f695db84bb814999c9ccce6656dad07e01208e4b0eb514ec319df1caa8aabd76e2a3afd1a1038049d81e1a1a48d7fa7445dd4 SHA512 80603a381d4f66cf1f1c05611cb87a3abe64b2e0e64dcf3534e777256194b497820e11b060c2218a3752b099072abea494b21cf0a3f9ef7e1665c0eb0cea41ed
+EBUILD neovim-python-client-0.1.9.ebuild 675 BLAKE2B a92e8fc5f69e7beb65032e66452aaf93e280f74a480e2ca1e8ea9dc0248f62c54765389128d153b10edd36cdaef21b0092fcd4a88f7b3779bb73de5e70e29cc2 SHA512 cbbd852156edcc2fd27365497cee82e741ce79750a2e337df3f4bd52f1689f3b9a62724c1a55623b44e08924357502ff0344968d515bf0a6ed996ecedb7840a7
+EBUILD neovim-python-client-0.2.0.ebuild 667 BLAKE2B 03872fffba5a240fe3248537d8fc0bb43ce34e2a02c62828c9b49cad8118831e067f9229b2086810af6151e6b8497950a878571f313139fcaeff0c0267117ef5 SHA512 62012b86095d9f8ad659d048fe3a19e512b5deaface4ca6e653301a2c01cb357e9186ea7fbbe7987ea8446839ff7dda7190bc8fb4e4fb10c3fd20ec34dabbfa6
 MISC metadata.xml 451 BLAKE2B c2317fb2bf039a77c223c958dd1238ed934621c556c9c8f565bca643a73e79bd036b71bf104146e810300bcfc755328365982d44fc4b4c46676e64d8720ae64c SHA512 cf9f4169ee1ea2adc6f88b17461202cfe120c20a5367ccc0da4099b8792841d13057d8c133c85179b1c5b00ad4bc9954a0e9202b3810a6342f8e052ffa3dc2f1
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild
index ba9be5d3944b..0e7fd586cc31 100644
--- a/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild
+++ b/dev-python/neovim-python-client/neovim-python-client-0.1.13.ebuild
@@ -4,7 +4,6 @@
 EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
 inherit distutils-r1
 
 DESCRIPTION="Python client for Neovim"
@@ -19,20 +18,18 @@ IUSE="test"
 COMMON_DEPEND="
 	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
 	virtual/python-greenlet[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python2_7)
-"
+	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python2_7)"
 
 RDEPEND="
 	${COMMON_DEPEND}
-	>=app-editors/neovim-0.1.6
-"
+	>=app-editors/neovim-0.1.6"
+
 DEPEND="
 	${COMMON_DEPEND}
 	test? (
 		${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
+	)"
 
 S="${WORKDIR}/python-client-${PV}"
 
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.1.9.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.1.9.ebuild
index 5a383838e3fe..8ad3f64bc344 100644
--- a/dev-python/neovim-python-client/neovim-python-client-0.1.9.ebuild
+++ b/dev-python/neovim-python-client/neovim-python-client-0.1.9.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Python client for Neovim"
@@ -16,12 +17,10 @@ KEYWORDS="~amd64 ~x86"
 DEPEND="
 	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
 	virtual/python-greenlet[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python{2_7,3_3})
-"
+	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python{2_7,3_3})"
 
 RDEPEND="
 	${DEPEND}
-	>=app-editors/neovim-0.1.3
-"
+	>=app-editors/neovim-0.1.3"
 
 S="${WORKDIR}/python-client-${PV}"
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.2.0.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.2.0.ebuild
index 66a5585d620d..9199fbf0576a 100644
--- a/dev-python/neovim-python-client/neovim-python-client-0.2.0.ebuild
+++ b/dev-python/neovim-python-client/neovim-python-client-0.2.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 inherit distutils-r1
 
 DESCRIPTION="Python client for Neovim"
diff --git a/dev-python/rackspace-monitoring/Manifest b/dev-python/rackspace-monitoring/Manifest
index 2f46fdc1d7f5..4ebe6802c876 100644
--- a/dev-python/rackspace-monitoring/Manifest
+++ b/dev-python/rackspace-monitoring/Manifest
@@ -1,3 +1,5 @@
 DIST rackspace-monitoring-0.6.5.tar.gz 31397 BLAKE2B 7e51dd95ca801feae7effbd4c59b3d1a2efeff08c17938b82341a1a4ed0635923d1bb518912a1dc11f98a4a94ff7638431f5180975896f09956b9cca0e8a5269 SHA512 513e02eb7b823ed4287462ffe6517011c389119dbf37d90df31cc08714f93806188d07e4f8d339453b59f17c067229a3f52f1ae7aaf13a7c6504c0ef63b1f4fe
+DIST rackspace-monitoring-0.8.0.tar.gz 32989 BLAKE2B 6b32fb0b90189fa6f7cb89eb39a90f9581ebca75b0b4f2eba9d4046b9a35ead66c4d4d5a1addd9143ef71c1d4bf05a5a81bb0582b69da80c5f8de7dfbe744009 SHA512 df0a2c38f1abbb71858f0b4347c5e64b481d03b332c02926b9f0def429b37f0b2bff8e026c5fdac566ed391234cf17f64ef10149186b9ac72a2938c205d2b658
 EBUILD rackspace-monitoring-0.6.5.ebuild 751 BLAKE2B a9e67e060179a564e3f7a3ee4b64b84afab8e8f2ae70da7961e12f60ca30461560448bf249b536e356575eba3d7f1f65d66772821b86940e82cdc4b1b36c24d6 SHA512 375096d9709f279ac0fd138f204f88a98bb9d45d25d2fb82b520ef17d8ec2bf7623447cb5587285ca9ce8dcc7332a3f4e7eebb2e6d75626e3f3fb46050bfcdea
+EBUILD rackspace-monitoring-0.8.0.ebuild 768 BLAKE2B 6e89c690b3007ae4a863b48071477f5487c2c544dc76348e071f40ca97af346687e63df30b71e659581bcaab942017ec35c928e34617c1a2f18a63f27236c8d9 SHA512 5ef33b839ba45ead060ed986a13ef6f4cde14f2dba3e33b32071381e3ceb844e29bc0725078b5945ff03e762989a8ed8ccd3d54f833434ee48987f8b549ab000
 MISC metadata.xml 625 BLAKE2B aa5e2b5fe0969d8e75886b59ecb571eae8947534026b6700e9ca165b2e039eb82762f8e2f07353c19c5bb691e810b542a1c9769036a82c4b55ae4a7989735bab SHA512 32694d23bf7e16926d283b4cde2d1afe82dddd8da74c29f4c654173883386b54378d4d29ad2ce7bc65452b22a69c6fd582303ccda323d8be6ef6808b5404e326
diff --git a/dev-python/rackspace-monitoring/rackspace-monitoring-0.8.0.ebuild b/dev-python/rackspace-monitoring/rackspace-monitoring-0.8.0.ebuild
new file mode 100644
index 000000000000..08341a863dab
--- /dev/null
+++ b/dev-python/rackspace-monitoring/rackspace-monitoring-0.8.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Client library for Rackspace Cloud Monitoring"
+HOMEPAGE="https://github.com/racker/rackspace-monitoring"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="test"  # resrticted for bug 636106
+
+TEST_DEPENDS="dev-python/pep8[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/libcloud-0.17.0[${PYTHON_USEDEP}]
+	<dev-python/libcloud-2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${TEST_DEPENDS}
+		${RDEPEND}
+	)
+"
+
+python_test() {
+	${EPYTHON} setup.py test || die
+}
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index c6b418087884..cc8f38f56039 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/collada_parser/Manifest b/dev-ros/collada_parser/Manifest
index 8e8505e9cb13..61a011349d4c 100644
--- a/dev-ros/collada_parser/Manifest
+++ b/dev-ros/collada_parser/Manifest
@@ -1,4 +1,4 @@
 DIST collada_urdf-1.12.10.tar.gz 73182 BLAKE2B 69f245e7962ad542a133ee71a7e9cbf7314ca7e754d95521dc802ef4296e957321897170444616bc2789626f19e7c368749f5644482dae04f28b864d08970de9 SHA512 78387ba78175099be0c48f966a185630598504f27d5baa76e9a9c088132b1368c698784c5367b376ac126e7c5a97a2117864561a073e6f9370a47fb86ad62ca4
-EBUILD collada_parser-1.12.10-r1.ebuild 548 BLAKE2B 2ba74109ca0b91b30dd3b0e5d6a799736d7a7ef99dce2da1e20714b7f60003972d771963d9349c939e6615aa12eaf54918b0315cc7c57c68672aab48363c3ec4 SHA512 848738902fd64ee9f5fcea26df263a0b238980aa27668d96af9f01cb7226d7f2a8d48bae23fe6f9c12685b5a76cc5a689f7f5614ba5a2d4245c4467ec6311850
-EBUILD collada_parser-9999.ebuild 548 BLAKE2B 2ba74109ca0b91b30dd3b0e5d6a799736d7a7ef99dce2da1e20714b7f60003972d771963d9349c939e6615aa12eaf54918b0315cc7c57c68672aab48363c3ec4 SHA512 848738902fd64ee9f5fcea26df263a0b238980aa27668d96af9f01cb7226d7f2a8d48bae23fe6f9c12685b5a76cc5a689f7f5614ba5a2d4245c4467ec6311850
+EBUILD collada_parser-1.12.10-r2.ebuild 550 BLAKE2B d0b518f76c6f7727ce27b5743ac0d0da6579f897af10f66ba6057359527174050253133e2ae0932b3c58b1366ba5480d7cb1240e3e41cb318cb2d8dffe3b1e50 SHA512 b9eca356eefbbd2b63983a9488de878aa172e959bce5b018b8ada72beabedee360b3a9075e75ef3972a4180fed2c79c00a98569b5a48daacf3f9391579f38a49
+EBUILD collada_parser-9999.ebuild 550 BLAKE2B d0b518f76c6f7727ce27b5743ac0d0da6579f897af10f66ba6057359527174050253133e2ae0932b3c58b1366ba5480d7cb1240e3e41cb318cb2d8dffe3b1e50 SHA512 b9eca356eefbbd2b63983a9488de878aa172e959bce5b018b8ada72beabedee360b3a9075e75ef3972a4180fed2c79c00a98569b5a48daacf3f9391579f38a49
 MISC metadata.xml 330 BLAKE2B c2da1c8743674b266a5f2f5fcc19b62552a16668ddc3770bbb693942a52e2b089e80646cbfd971cc9d8a196d62cf5fa08fc9612c2b9f8e0fe4127af47de683ff SHA512 ee9d0c6d572e3e0027eac2efd899d9008549a7f45a7ca92356bc62c7f3f10fc6aa3a9bb5e4b926ee44bf106350769c9ddf7d351761457707fba21f6e1c9eb3bf
diff --git a/dev-ros/collada_parser/collada_parser-1.12.10-r1.ebuild b/dev-ros/collada_parser/collada_parser-1.12.10-r2.ebuild
index 2060cdbb60de..e300d9bb66a7 100644
--- a/dev-ros/collada_parser/collada_parser-1.12.10-r1.ebuild
+++ b/dev-ros/collada_parser/collada_parser-1.12.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/class_loader
 	dev-libs/urdfdom_headers
-	dev-libs/collada-dom
+	dev-libs/collada-dom:=
 	>=dev-ros/urdf-1.12.6
 	dev-libs/console_bridge:=
 "
diff --git a/dev-ros/collada_parser/collada_parser-9999.ebuild b/dev-ros/collada_parser/collada_parser-9999.ebuild
index 2060cdbb60de..e300d9bb66a7 100644
--- a/dev-ros/collada_parser/collada_parser-9999.ebuild
+++ b/dev-ros/collada_parser/collada_parser-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/class_loader
 	dev-libs/urdfdom_headers
-	dev-libs/collada-dom
+	dev-libs/collada-dom:=
 	>=dev-ros/urdf-1.12.6
 	dev-libs/console_bridge:=
 "
diff --git a/dev-ros/collada_urdf/Manifest b/dev-ros/collada_urdf/Manifest
index 1872f68434ef..b599ae05ea33 100644
--- a/dev-ros/collada_urdf/Manifest
+++ b/dev-ros/collada_urdf/Manifest
@@ -1,4 +1,4 @@
 DIST collada_urdf-1.12.10.tar.gz 73182 BLAKE2B 69f245e7962ad542a133ee71a7e9cbf7314ca7e754d95521dc802ef4296e957321897170444616bc2789626f19e7c368749f5644482dae04f28b864d08970de9 SHA512 78387ba78175099be0c48f966a185630598504f27d5baa76e9a9c088132b1368c698784c5367b376ac126e7c5a97a2117864561a073e6f9370a47fb86ad62ca4
-EBUILD collada_urdf-1.12.10.ebuild 583 BLAKE2B 6ebc19c0fa5115a1534a75647f7540256b45eb53b4c9ad098f9b85ce084ecb48cd3249d8e50cdd0422ef8245f75d1dfc0e6d78546c22a2be9ad9da7fec4585f1 SHA512 6a442d2c0517a3fdb1d0648f8852c79c9e97b4cfdacf4cbfc1c0f1163716fa0370e71ecd10bcd415cb5f761777c8c9d444a72a2fffe5d95ae69cfa597be88858
-EBUILD collada_urdf-9999.ebuild 583 BLAKE2B 6ebc19c0fa5115a1534a75647f7540256b45eb53b4c9ad098f9b85ce084ecb48cd3249d8e50cdd0422ef8245f75d1dfc0e6d78546c22a2be9ad9da7fec4585f1 SHA512 6a442d2c0517a3fdb1d0648f8852c79c9e97b4cfdacf4cbfc1c0f1163716fa0370e71ecd10bcd415cb5f761777c8c9d444a72a2fffe5d95ae69cfa597be88858
+EBUILD collada_urdf-1.12.10-r1.ebuild 585 BLAKE2B 4ac88d382e17505599c338392d20bc7fe770728b06587e248a1c77a7550e2f1cf4775bad0713891eb25b969aecedc3b25e090f87430c19cfea6cdae357225f6b SHA512 72c1728b7ea621ee064611082ebc3b8fd2f7330891e79c34ac023def00a535fd749dc1a27ffb84beee12c715967b2f12aff66c0480226fe26fe582d835806475
+EBUILD collada_urdf-9999.ebuild 585 BLAKE2B 4ac88d382e17505599c338392d20bc7fe770728b06587e248a1c77a7550e2f1cf4775bad0713891eb25b969aecedc3b25e090f87430c19cfea6cdae357225f6b SHA512 72c1728b7ea621ee064611082ebc3b8fd2f7330891e79c34ac023def00a535fd749dc1a27ffb84beee12c715967b2f12aff66c0480226fe26fe582d835806475
 MISC metadata.xml 330 BLAKE2B c2da1c8743674b266a5f2f5fcc19b62552a16668ddc3770bbb693942a52e2b089e80646cbfd971cc9d8a196d62cf5fa08fc9612c2b9f8e0fe4127af47de683ff SHA512 ee9d0c6d572e3e0027eac2efd899d9008549a7f45a7ca92356bc62c7f3f10fc6aa3a9bb5e4b926ee44bf106350769c9ddf7d351761457707fba21f6e1c9eb3bf
diff --git a/dev-ros/collada_urdf/collada_urdf-1.12.10.ebuild b/dev-ros/collada_urdf/collada_urdf-1.12.10-r1.ebuild
index 392b9b5ad2af..1a3e4542f459 100644
--- a/dev-ros/collada_urdf/collada_urdf-1.12.10.ebuild
+++ b/dev-ros/collada_urdf/collada_urdf-1.12.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,6 +23,6 @@ RDEPEND="
 	dev-ros/tf
 	media-libs/assimp
 	dev-libs/tinyxml
-	dev-libs/collada-dom
+	dev-libs/collada-dom:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/collada_urdf/collada_urdf-9999.ebuild b/dev-ros/collada_urdf/collada_urdf-9999.ebuild
index 392b9b5ad2af..1a3e4542f459 100644
--- a/dev-ros/collada_urdf/collada_urdf-9999.ebuild
+++ b/dev-ros/collada_urdf/collada_urdf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,6 +23,6 @@ RDEPEND="
 	dev-ros/tf
 	media-libs/assimp
 	dev-libs/tinyxml
-	dev-libs/collada-dom
+	dev-libs/collada-dom:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/interactive_marker_tutorials/Manifest b/dev-ros/interactive_marker_tutorials/Manifest
index 291398723ce4..e1c77b00a0fd 100644
--- a/dev-ros/interactive_marker_tutorials/Manifest
+++ b/dev-ros/interactive_marker_tutorials/Manifest
@@ -1,4 +1,6 @@
 DIST visualization_tutorials-0.10.1.tar.gz 428608 BLAKE2B abee44fa91388e792a5e2ccadf07a32236f7575f5a0e0121ddfdc0135bf63b12c8d603d4bee3ef463f0c64debf9e9c6f8c7c89c2e8dce8375d3264039b6378b0 SHA512 38ad2c29456ff994914b1ca3b2ab6d90b0c9224481d360fd7f88b38c0e9615d35eb94b90abb699738b5f4fac091489bdf2373168bc3a0acc0e6ba3a61b646bbf
+DIST visualization_tutorials-0.10.2.tar.gz 428684 BLAKE2B 751d18089c69cdb8cd0cfac97235d213cce9d098264dc49fcaf7d7a949216b8fd40041c23be5d16be1537298b876dc1854a8b7dc1214ba7aeb74b18716892636 SHA512 40d8621fd05e81dc23adbf7fd0a69209d796ade3ad291aa350030872a3bbffad2ec9ac0d31734ccf73f8215f7dd52834a35baaa3fe198a3fc4c5bda71a760b05
 EBUILD interactive_marker_tutorials-0.10.1.ebuild 616 BLAKE2B 72b4d727495dbe33c5fb596eee49474e4eac54f8d4c400a704a58efe364e4634203d102510ab77f2c9716a9f7c28f79127c2399ba05095cacbe9f612eb86dcab SHA512 23efafcbdb9297b028329a3486533e10ed560e5dcc053f397ceac1f16e2052702498346dad522191167bcb26a4141b71922dd5a3d4ce7f4e6a7d11747299dd10
+EBUILD interactive_marker_tutorials-0.10.2.ebuild 616 BLAKE2B 1a0233430e646cee91bd197ba068742de0a91ac963e060d23587e45b4b9e7aab5829bcc36a666367bf1cb50d36159a68d83c35e72499b5affce16c7bd45835d3 SHA512 d4c1167db05ac08c3f44a7fa8c1ecd5df277b045dc5a173a0bd61d6713cda6f5f3f23e7e81d42b537ca8b1acea0e66370f704bcaa5283d508918dec63aa6d7e6
 EBUILD interactive_marker_tutorials-9999.ebuild 616 BLAKE2B 72b4d727495dbe33c5fb596eee49474e4eac54f8d4c400a704a58efe364e4634203d102510ab77f2c9716a9f7c28f79127c2399ba05095cacbe9f612eb86dcab SHA512 23efafcbdb9297b028329a3486533e10ed560e5dcc053f397ceac1f16e2052702498346dad522191167bcb26a4141b71922dd5a3d4ce7f4e6a7d11747299dd10
 MISC metadata.xml 355 BLAKE2B fb6b9ee20af31ea0d99819722e6df9dc086b3b4de71d9a3aba80bee73490a62738ce308e9b1e77ee22c079e21ff7623b13fd7d46fd8d670232ea45a3cffd47ae SHA512 5e233967a9e4b9c0f790ddfa82d4c2febbb2948b3ed3abe4ec91d1ec0e80202738daed074eb911a63ccd6209837f5e52ab985ff4e792f3e90a38120963e8db34
diff --git a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.2.ebuild b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.2.ebuild
new file mode 100644
index 000000000000..834526809e25
--- /dev/null
+++ b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Interactive marker tutorials"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/interactive_markers
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/tf[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/librviz_tutorial/Manifest b/dev-ros/librviz_tutorial/Manifest
index 63b8d2a42a5d..3624ee306d68 100644
--- a/dev-ros/librviz_tutorial/Manifest
+++ b/dev-ros/librviz_tutorial/Manifest
@@ -1,4 +1,6 @@
 DIST visualization_tutorials-0.10.1.tar.gz 428608 BLAKE2B abee44fa91388e792a5e2ccadf07a32236f7575f5a0e0121ddfdc0135bf63b12c8d603d4bee3ef463f0c64debf9e9c6f8c7c89c2e8dce8375d3264039b6378b0 SHA512 38ad2c29456ff994914b1ca3b2ab6d90b0c9224481d360fd7f88b38c0e9615d35eb94b90abb699738b5f4fac091489bdf2373168bc3a0acc0e6ba3a61b646bbf
+DIST visualization_tutorials-0.10.2.tar.gz 428684 BLAKE2B 751d18089c69cdb8cd0cfac97235d213cce9d098264dc49fcaf7d7a949216b8fd40041c23be5d16be1537298b876dc1854a8b7dc1214ba7aeb74b18716892636 SHA512 40d8621fd05e81dc23adbf7fd0a69209d796ade3ad291aa350030872a3bbffad2ec9ac0d31734ccf73f8215f7dd52834a35baaa3fe198a3fc4c5bda71a760b05
 EBUILD librviz_tutorial-0.10.1.ebuild 458 BLAKE2B 1e6cba7a4fece4d4c82e809a51b93ad1f10aa073d006c1f7df851d2d1343d9b47de412d96f18b65ef25cfaca5985fa50c5f12d21dc253d74e0625cc8b8a7c420 SHA512 c93eedc30fade27d4d85dda547b49566227517b729ede7503b5334b549ba549cccfc700249cd2da6636ad1413765a5a491f0348e39c5649985e152162adc48a8
+EBUILD librviz_tutorial-0.10.2.ebuild 458 BLAKE2B 3ee42f59d025c0fb9a8adaf3b1355f78aa8c7ba82f5f779691a4c15f2362791e15d88f3271d902bad059eb3ee59619e496a1f7dc12745cf1f3926840f33436a1 SHA512 b86dbc8b4d38f91faad5771afd1f769af6123e83258c56a5c6502f1a6259194ad9c3c61d219499fa4df4ac79c61fddd5d4155a4ce941d0548b86e15f075168c8
 EBUILD librviz_tutorial-9999.ebuild 458 BLAKE2B 1e6cba7a4fece4d4c82e809a51b93ad1f10aa073d006c1f7df851d2d1343d9b47de412d96f18b65ef25cfaca5985fa50c5f12d21dc253d74e0625cc8b8a7c420 SHA512 c93eedc30fade27d4d85dda547b49566227517b729ede7503b5334b549ba549cccfc700249cd2da6636ad1413765a5a491f0348e39c5649985e152162adc48a8
 MISC metadata.xml 355 BLAKE2B fb6b9ee20af31ea0d99819722e6df9dc086b3b4de71d9a3aba80bee73490a62738ce308e9b1e77ee22c079e21ff7623b13fd7d46fd8d670232ea45a3cffd47ae SHA512 5e233967a9e4b9c0f790ddfa82d4c2febbb2948b3ed3abe4ec91d1ec0e80202738daed074eb911a63ccd6209837f5e52ab985ff4e792f3e90a38120963e8db34
diff --git a/dev-ros/librviz_tutorial/librviz_tutorial-0.10.2.ebuild b/dev-ros/librviz_tutorial/librviz_tutorial-0.10.2.ebuild
new file mode 100644
index 000000000000..dbb62ffac134
--- /dev/null
+++ b/dev-ros/librviz_tutorial/librviz_tutorial-0.10.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tutorial showing how to compile your own C++ program with RViz displays and features"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/rviz
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest
index 8385b156aa08..671d232ddb0f 100644
--- a/dev-ros/rviz/Manifest
+++ b/dev-ros/rviz/Manifest
@@ -1,4 +1,6 @@
 DIST rviz-1.12.14.tar.gz 5087682 BLAKE2B 0ff42da139419b819e224459826d0bcc49bb70c9ca1c878487abee188321030f1c5535ff3ce7a1462b6946f2a9eac1cc1022f31289c5d138b0a64cef213228bc SHA512 748e3daf3fef53086f9056532e1fc9d3ca5a9130656b880487b50a557115e603ad843dd7f363241eb0b4d300f9fbe601fbd645f1e629ac2760a8a54666028e68
+DIST rviz-1.12.15.tar.gz 5088184 BLAKE2B 9096cd707ff265847fdb0ddc71b31ec50dcfb9af0cb658ccbe8530d75cf82abcfa7d5a76f220e1bf2393e28807b44fec3d8690463f19dfb6482bc7b51a07f2c2 SHA512 d12ca4b56a7a2a19f37ca69a4efc0f474ff1409cdd9e1f1d357d6c2b6033a21183e469c712b5583ddc41f579f697d55145516c79797e846d3345019e57615ad6
 EBUILD rviz-1.12.14-r1.ebuild 1692 BLAKE2B a31df46f2a1005c6abd422f46bf5c86ecf0010e11df7d5a4fbf7c977791715fd75e7e84f5aa0afcc35583c55de69ef904c0d008fa54ab462a03be75b395d391c SHA512 32cf80f7a5905012493bbdfce94783ac1b527be8d9bbe87ac446a55b8e81e4a78d05292e9fe34c52625144988cbf5b704802bed4f5ea315ea072a46d7522612e
+EBUILD rviz-1.12.15.ebuild 1692 BLAKE2B ae4b0343cb36b8b23fd91d50b9446346d861f9902aceec2f47a0e89f6a1ca012cc111061bf5bfcc5031913636db97a1f8cec0f0193cd426d4b9118653870c896 SHA512 4c02fdf00f49e8a080b7bf6b9417f7027f90678e000130174b19db764b4bb3034b35e3dcc52c97f88b1eed812ff4f0a946e3fa3fd2c4f9a307905ab6a5dc35c9
 EBUILD rviz-9999.ebuild 1692 BLAKE2B a31df46f2a1005c6abd422f46bf5c86ecf0010e11df7d5a4fbf7c977791715fd75e7e84f5aa0afcc35583c55de69ef904c0d008fa54ab462a03be75b395d391c SHA512 32cf80f7a5905012493bbdfce94783ac1b527be8d9bbe87ac446a55b8e81e4a78d05292e9fe34c52625144988cbf5b704802bed4f5ea315ea072a46d7522612e
 MISC metadata.xml 336 BLAKE2B 8cba61f66f05c578aa056805cff5c5f9b79f4cc9a36001a5c332b048958039e049e8003b4c6a6cbe44a10973b5094daf880f25f9a124a2967069687762a492d0 SHA512 5621623b90d64245ec73b1ff7cace103dd809ac9da8b4614cd8b5931854ed159e8b5de867f1a6e83949376b99e41c181def0569f90f128c4c85e97cd42659120
diff --git a/dev-ros/rviz/rviz-1.12.15.ebuild b/dev-ros/rviz/rviz-1.12.15.ebuild
new file mode 100644
index 000000000000..f13960c9eecb
--- /dev/null
+++ b/dev-ros/rviz/rviz-1.12.15.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros-visualization/rviz"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="3D visualization tool for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	media-libs/assimp
+	dev-games/ogre
+	virtual/opengl
+	dev-qt/qtwidgets:5
+	dev-qt/qtcore:5
+	dev-qt/qtopengl:5
+	dev-cpp/eigen:3
+	dev-cpp/yaml-cpp
+	dev-libs/urdfdom:=
+	dev-libs/tinyxml:=
+
+	dev-ros/angles
+	dev-ros/image_geometry
+	dev-ros/image_transport
+	dev-ros/interactive_markers
+	dev-ros/laser_geometry
+	dev-ros/message_filters
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
+	dev-ros/resource_retriever
+	dev-ros/rosbag[${PYTHON_USEDEP}]
+	dev-ros/rosconsole
+	dev-libs/console_bridge:=
+	dev-ros/roscpp
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/tf
+	dev-ros/urdf
+	dev-ros/media_export
+
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	virtual/pkgconfig
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-cpp/gtest
+	)"
+
+src_configure() {
+	local mycatkincmakeargs=( "-DUseQt5=ON" )
+	ros-catkin_src_configure
+}
diff --git a/dev-ros/rviz_plugin_tutorials/Manifest b/dev-ros/rviz_plugin_tutorials/Manifest
index b2a135f2a436..3991d270e116 100644
--- a/dev-ros/rviz_plugin_tutorials/Manifest
+++ b/dev-ros/rviz_plugin_tutorials/Manifest
@@ -1,4 +1,6 @@
 DIST visualization_tutorials-0.10.1.tar.gz 428608 BLAKE2B abee44fa91388e792a5e2ccadf07a32236f7575f5a0e0121ddfdc0135bf63b12c8d603d4bee3ef463f0c64debf9e9c6f8c7c89c2e8dce8375d3264039b6378b0 SHA512 38ad2c29456ff994914b1ca3b2ab6d90b0c9224481d360fd7f88b38c0e9615d35eb94b90abb699738b5f4fac091489bdf2373168bc3a0acc0e6ba3a61b646bbf
+DIST visualization_tutorials-0.10.2.tar.gz 428684 BLAKE2B 751d18089c69cdb8cd0cfac97235d213cce9d098264dc49fcaf7d7a949216b8fd40041c23be5d16be1537298b876dc1854a8b7dc1214ba7aeb74b18716892636 SHA512 40d8621fd05e81dc23adbf7fd0a69209d796ade3ad291aa350030872a3bbffad2ec9ac0d31734ccf73f8215f7dd52834a35baaa3fe198a3fc4c5bda71a760b05
 EBUILD rviz_plugin_tutorials-0.10.1-r4.ebuild 485 BLAKE2B 66b0981eaa7c9c6c68080f2d95ab1716177cdef66cca4707136cbbb615dd5d182df90141af46ae600f85cbe2cde6ca4f111d230bc5918391043e449f564b2b13 SHA512 d31845c711675a6b21145b40abe1265f4e0993304baf68811ca60997d1764bc7cb0686893c79bfdc82170d93a15f0732cc624dd14208bdb0d02aaf0b784a4b90
+EBUILD rviz_plugin_tutorials-0.10.2.ebuild 485 BLAKE2B 006d43fcd28dcea0c19489210fa8f59b7636d17c331302f4071194bed98fcf3c3c38afba36d4c5547ac7ef0cf24e6983d1eb0092fb1f60166446ba1b4ac22c46 SHA512 733dd923bf39dd41c91f9a27c5d6c362362cefd631007c55fc09865c3a1ed70a3d48707e0394dbc84c39a45dc0e0e7f90e49e280caae67abec0a6128f7037dcb
 EBUILD rviz_plugin_tutorials-9999.ebuild 485 BLAKE2B 66b0981eaa7c9c6c68080f2d95ab1716177cdef66cca4707136cbbb615dd5d182df90141af46ae600f85cbe2cde6ca4f111d230bc5918391043e449f564b2b13 SHA512 d31845c711675a6b21145b40abe1265f4e0993304baf68811ca60997d1764bc7cb0686893c79bfdc82170d93a15f0732cc624dd14208bdb0d02aaf0b784a4b90
 MISC metadata.xml 355 BLAKE2B fb6b9ee20af31ea0d99819722e6df9dc086b3b4de71d9a3aba80bee73490a62738ce308e9b1e77ee22c079e21ff7623b13fd7d46fd8d670232ea45a3cffd47ae SHA512 5e233967a9e4b9c0f790ddfa82d4c2febbb2948b3ed3abe4ec91d1ec0e80202738daed074eb911a63ccd6209837f5e52ab985ff4e792f3e90a38120963e8db34
diff --git a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.2.ebuild b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.2.ebuild
new file mode 100644
index 000000000000..1e7aa88d9e30
--- /dev/null
+++ b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tutorials showing how to write plugins for RViz"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rviz
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz_python_tutorial/Manifest b/dev-ros/rviz_python_tutorial/Manifest
index f47c49c6781d..0a392f8e3168 100644
--- a/dev-ros/rviz_python_tutorial/Manifest
+++ b/dev-ros/rviz_python_tutorial/Manifest
@@ -1,6 +1,8 @@
 DIST visualization_tutorials-0.10.1.tar.gz 428608 BLAKE2B abee44fa91388e792a5e2ccadf07a32236f7575f5a0e0121ddfdc0135bf63b12c8d603d4bee3ef463f0c64debf9e9c6f8c7c89c2e8dce8375d3264039b6378b0 SHA512 38ad2c29456ff994914b1ca3b2ab6d90b0c9224481d360fd7f88b38c0e9615d35eb94b90abb699738b5f4fac091489bdf2373168bc3a0acc0e6ba3a61b646bbf
+DIST visualization_tutorials-0.10.2.tar.gz 428684 BLAKE2B 751d18089c69cdb8cd0cfac97235d213cce9d098264dc49fcaf7d7a949216b8fd40041c23be5d16be1537298b876dc1854a8b7dc1214ba7aeb74b18716892636 SHA512 40d8621fd05e81dc23adbf7fd0a69209d796ade3ad291aa350030872a3bbffad2ec9ac0d31734ccf73f8215f7dd52834a35baaa3fe198a3fc4c5bda71a760b05
 DIST visualization_tutorials-0.9.2.tar.gz 428117 BLAKE2B f25320fa80b12a8a5499d505af369c33362e7f085de3846478b6376fc49e4e2502f07ded6c9e1025224d7b2418d78c87933b2d93b66ad2865eb45581384df24f SHA512 4a2b323e74725dbb77fbba6405d39246a89b170c66dec78288c4461d70c419efc3197eed5867f68305e490552d0480525153f98a64a3025efddc367db824ca53
 EBUILD rviz_python_tutorial-0.10.1.ebuild 452 BLAKE2B 1af501744428e5693ba71a326092d6d17ee9f8be078eabee5febc2a91b1ead2c6c491a2e1d4dcc66e17dd976bff21a878304c25ee35bcfc8c361e0b86bec4c2f SHA512 45d3339c26b33bb6af6d4fb859e670f1cb68e74fb8247da1106337aadce43b565320a053512d9f8ae1081aae9e840011e8050726f33659d3ef7c9386ceffcc95
+EBUILD rviz_python_tutorial-0.10.2.ebuild 452 BLAKE2B 7cb142425b38933b78c712a3de1f919647f00a7074cf234bb321c929cca089c7b35d10fbc5c85e88d6685a0bf562fec48c859fa4d1e40d61783a553b8b1803f2 SHA512 d0d18eb2f5b0602c9653261de0a2c3e1dc6014e29245b7a50f0518d444e711becf17af97029fdfcfa695760f9a735264b9a0d89eff1a17189aeac0bf2297b9c5
 EBUILD rviz_python_tutorial-0.9.2.ebuild 452 BLAKE2B 1af501744428e5693ba71a326092d6d17ee9f8be078eabee5febc2a91b1ead2c6c491a2e1d4dcc66e17dd976bff21a878304c25ee35bcfc8c361e0b86bec4c2f SHA512 45d3339c26b33bb6af6d4fb859e670f1cb68e74fb8247da1106337aadce43b565320a053512d9f8ae1081aae9e840011e8050726f33659d3ef7c9386ceffcc95
 EBUILD rviz_python_tutorial-9999.ebuild 452 BLAKE2B 1af501744428e5693ba71a326092d6d17ee9f8be078eabee5febc2a91b1ead2c6c491a2e1d4dcc66e17dd976bff21a878304c25ee35bcfc8c361e0b86bec4c2f SHA512 45d3339c26b33bb6af6d4fb859e670f1cb68e74fb8247da1106337aadce43b565320a053512d9f8ae1081aae9e840011e8050726f33659d3ef7c9386ceffcc95
 MISC metadata.xml 355 BLAKE2B fb6b9ee20af31ea0d99819722e6df9dc086b3b4de71d9a3aba80bee73490a62738ce308e9b1e77ee22c079e21ff7623b13fd7d46fd8d670232ea45a3cffd47ae SHA512 5e233967a9e4b9c0f790ddfa82d4c2febbb2948b3ed3abe4ec91d1ec0e80202738daed074eb911a63ccd6209837f5e52ab985ff4e792f3e90a38120963e8db34
diff --git a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.2.ebuild b/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.2.ebuild
new file mode 100644
index 000000000000..0f3ef919f175
--- /dev/null
+++ b/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Tutorials showing how to call into rviz internals from python scripts"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rviz[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/test_tf2/Manifest b/dev-ros/test_tf2/Manifest
index 1306f84204cb..ecc0cf1eb840 100644
--- a/dev-ros/test_tf2/Manifest
+++ b/dev-ros/test_tf2/Manifest
@@ -1,6 +1,7 @@
 DIST geometry2-0.5.14.tar.gz 147162 BLAKE2B 9034e37e099e601323ad7bd7ca167a93dd40143efe2e9d202f61cf2740f02f537f3880df87d41ec377e09f9d31914c164a8fe0f94f3cdea23a7d1c4bd98098d5 SHA512 1e32dbfbd46a2d72dcc53cf67914bdc6bd1907cf8d9b6c24c5b73e9738a7068b1b974ea434a267f907f276bf70b85f7169d85679449402e0808edadb9fe21e82
 DIST geometry2-0.5.15.tar.gz 147275 BLAKE2B 27a520d7c76eeea551d95092ede446f2badaee72b72ff24936a2116a0fa824d3f83afa7b07c5d962824e163a4d470490a0d68a8026e9bf829e87d1008b88ddc3 SHA512 10a750948157904c0812aaae85e21eaf5c85dfef3770d418fd0c592a9179cef9fc2082ecc125be0fd0032e705dfb678d45930d3aa2cd0986a71c2e0a7307722c
 DIST geometry2-0.5.16.tar.gz 154351 BLAKE2B e630be09da6de544de0215d40ffcb0aa780be253320264d52603d5fe7506d12b27e986acb9c036973ba390c5cd96b5e838849ee2f5b1399148cf5cffb461cd76 SHA512 11909db98af78bbdef8d1a7dc5f20d3ff3cfcb0afc0e1d53b97a1ffe99aecea911f09364593eb232d7514a4caa192141404d892a33fc7ea9f5ce924ecf99fc51
+DIST geometry2-0.5.17.tar.gz 156516 BLAKE2B 72f936086fe3dbcfa3c05f7ae72e64f20fd1525513e79ed9c4dae7c5b097501ea230c483a3f1eb6e0ba6a342e0ddc5deacf05ec9f0c97b56df48dcf2bf669e8b SHA512 44d91796f03d0cbd8a9247568827dca4a848ec931fa754fd7815e9102f7bcac38e85ebcc27e3037827358dbfbc7d58b28775f00e1e04c48125e56c7b97cde925
 DIST geometry_experimental-0.5.12.tar.gz 131234 BLAKE2B 1b4a32aec39ed5e53c6bd7b91a85e5667202c59d9e6b2854dab8ced87968cdce71aa2cf7e6e40d6d8b34ae30faf38263a9cec04111f03f17f66bf34563c4728d SHA512 1a1a33db529d0810661c020552642d914de01a14e5b17b611fb7743a795c47e3f68d480ee4544b4ad86f7b1c947ea8b23cda09535ce046fdc45da1c40fc34711
 DIST geometry_experimental-0.5.13.tar.gz 134107 BLAKE2B eeeca3cd764775e6fc2ab73147b033a1bcb39a57a72516690772f40e7fca2d26d85e66cbf3a37a0a56d8be3e7239c1996344a40b94a82e2591bbc141e94c8fe4 SHA512 5b31a2ec2c8f852934c1c9a6aa0127c96b8f334f178742111c673195562a240649ac11ddde8d9738defae99184bdd83a57430fe6f17eb4cbd08ae600bfa7d43d
 EBUILD test_tf2-0.5.12-r1.ebuild 753 BLAKE2B f2d84301aa86da64e1d42a99ec35f92a95879eee8e1a2511b4a56ae2b8237828d45b2bffdc04086930bf0a7d9158c4f28cc61ecb9d308bf85199ef1f329d152d SHA512 780ba049a27af505b5ba710ebd72a48d5becea442821da031cf95829a209ebe33cad1b36dd091e4aa810f8c892ba81b9b99020f0e1b6d996683d58d1e2e40f12
@@ -8,5 +9,6 @@ EBUILD test_tf2-0.5.13.ebuild 753 BLAKE2B f2d84301aa86da64e1d42a99ec35f92a95879e
 EBUILD test_tf2-0.5.14.ebuild 741 BLAKE2B 2913249074a919534e3d42b22cccb6feafae0280339295a6a283cc0992de58225002ac74b26650126f3e203ff74fa8cdacb17b78dbc7bf4ce136d32a414afe43 SHA512 20ba3059bafc461a232c8c94e62e85ca9e38553f9e58a5154e9ce0b7089d5e2a5d1022972289c2de7b4ced6741a95dbff33d076551bd4b0771e60e45f0eebcfd
 EBUILD test_tf2-0.5.15.ebuild 741 BLAKE2B 2913249074a919534e3d42b22cccb6feafae0280339295a6a283cc0992de58225002ac74b26650126f3e203ff74fa8cdacb17b78dbc7bf4ce136d32a414afe43 SHA512 20ba3059bafc461a232c8c94e62e85ca9e38553f9e58a5154e9ce0b7089d5e2a5d1022972289c2de7b4ced6741a95dbff33d076551bd4b0771e60e45f0eebcfd
 EBUILD test_tf2-0.5.16.ebuild 741 BLAKE2B 2913249074a919534e3d42b22cccb6feafae0280339295a6a283cc0992de58225002ac74b26650126f3e203ff74fa8cdacb17b78dbc7bf4ce136d32a414afe43 SHA512 20ba3059bafc461a232c8c94e62e85ca9e38553f9e58a5154e9ce0b7089d5e2a5d1022972289c2de7b4ced6741a95dbff33d076551bd4b0771e60e45f0eebcfd
+EBUILD test_tf2-0.5.17.ebuild 741 BLAKE2B b7ef0a75c8c15478dff57e2129bba8134152c7c2cb3662f37ffe33d80457f18a66a270bbb72c9b6626085331d196ff59536511432dc2235ec829a62481711d24 SHA512 da448edd248d912e18e51e431510252ffc87f766341cef516fb332ce8dc63ecdac1d3943799c31123c1362045bed1ba108ca5d0489c7a54c677b5d033b9979ea
 EBUILD test_tf2-9999.ebuild 741 BLAKE2B 2913249074a919534e3d42b22cccb6feafae0280339295a6a283cc0992de58225002ac74b26650126f3e203ff74fa8cdacb17b78dbc7bf4ce136d32a414afe43 SHA512 20ba3059bafc461a232c8c94e62e85ca9e38553f9e58a5154e9ce0b7089d5e2a5d1022972289c2de7b4ced6741a95dbff33d076551bd4b0771e60e45f0eebcfd
 MISC metadata.xml 339 BLAKE2B bf7648aaefd8e1834d8d0faf1307566a068bffc3873942b6c799124486a369df38f2defae61afb67c51ed4750b77ee68ab163d1510b6ea0dedb3867bfa9a29e2 SHA512 70bde02b98edb10a9340db05de2bac26828bafd43be3fe2796a4cc8c115b409eac13c0eecd0ecb038f49f6eaa2bd6588671afff450fef02c0301356323216d51
diff --git a/dev-ros/test_tf2/test_tf2-0.5.17.ebuild b/dev-ros/test_tf2/test_tf2-0.5.17.ebuild
new file mode 100644
index 000000000000..9bfecde03150
--- /dev/null
+++ b/dev-ros/test_tf2/test_tf2-0.5.17.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 unit tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/tf
+	dev-ros/tf2
+	dev-ros/tf2_bullet
+	dev-ros/tf2_ros[${PYTHON_USEDEP}]
+	dev-ros/tf2_geometry_msgs[${PYTHON_USEDEP}]
+	dev-ros/tf2_kdl[${PYTHON_USEDEP}]
+	dev-ros/tf2_msgs
+	sci-libs/orocos_kdl
+	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+	dev-libs/boost:=[threads]
+	dev-cpp/gtest"
+
+mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/tf2/Manifest b/dev-ros/tf2/Manifest
index 5e2be73fea1b..63aa1004200e 100644
--- a/dev-ros/tf2/Manifest
+++ b/dev-ros/tf2/Manifest
@@ -1,5 +1,8 @@
 AUX logging.patch 5541 BLAKE2B 8c9b0a8dbd252578a1937f94001dd6748f0f90e26a3124b59d8532937c8429509f7ee5eec282ea16f7b1da689ab915d5e7f453d97b2caf1192d51a325647bae3 SHA512 7eba7fac00a5ae57f248923fd7239b2bd5cfc1856ffcdcb945abc1c3bed47591019df5c74e8efb57069ce04d5d11f4a13f3a1184b1f08f9366028693eda85137
+AUX logging2.patch 5525 BLAKE2B 45b97190e37707666411200902ed91679e0ee84b97fc3f2b89da7f501e4e040a2c2d652ddcb3ef239b0c290b736214f58f23ac573fa899436570b617468052d6 SHA512 15bb8059c5d6f85b9ff8483140577bba05dff762c47e49fdadcba3f297381b74142118fa86bdbd0dae34e245cd24c6813ad8185ee51201022cad094a550523d4
 DIST geometry2-0.5.16.tar.gz 154351 BLAKE2B e630be09da6de544de0215d40ffcb0aa780be253320264d52603d5fe7506d12b27e986acb9c036973ba390c5cd96b5e838849ee2f5b1399148cf5cffb461cd76 SHA512 11909db98af78bbdef8d1a7dc5f20d3ff3cfcb0afc0e1d53b97a1ffe99aecea911f09364593eb232d7514a4caa192141404d892a33fc7ea9f5ce924ecf99fc51
+DIST geometry2-0.5.17.tar.gz 156516 BLAKE2B 72f936086fe3dbcfa3c05f7ae72e64f20fd1525513e79ed9c4dae7c5b097501ea230c483a3f1eb6e0ba6a342e0ddc5deacf05ec9f0c97b56df48dcf2bf669e8b SHA512 44d91796f03d0cbd8a9247568827dca4a848ec931fa754fd7815e9102f7bcac38e85ebcc27e3037827358dbfbc7d58b28775f00e1e04c48125e56c7b97cde925
 EBUILD tf2-0.5.16-r1.ebuild 590 BLAKE2B 32fee5598ef4a136435f6ec1f96bba9f0240715d25f8c9251718a409e7bccb7e1b3c193fc57373126678f3a6195ddffc544530d77196292c3c00c5f571dfff77 SHA512 05e9e783551bc5a9eb66f211ce1a1c452c1027f46b2abb47b7951a2eeb343fbe72fdb27fcb353f97fac9c11866b450499d5c059c062f4dfb8662c9a9f526bb17
+EBUILD tf2-0.5.17.ebuild 591 BLAKE2B dbc52be3548178d8d2117b1e72c561a78e9a0e50be6b84a52c71cb119f3f09fdbb76626e1448298c60b897651193ce2e40e7680ce70ff4331e1ff8c730042aaa SHA512 626f6abe2243cf11c4022efe086a259dee70fb8a56a08e0c8f50fc6166b7b461840262a277fe824970048eac3567e435f704f98d701f70c10a24e340c84a4ba0
 EBUILD tf2-9999.ebuild 550 BLAKE2B 10c50cfb412755a1c9ca026c2343da67ebdd73a2d9b9eb3697d7d87ca3a167e7f02008cd1f55c6cea8129b162d32c0277ddadfe07dc814a8359e0366f4013121 SHA512 f90dce47cd2d78d2de07c1bfc8da8e17865fe4c3e76313efc8751be397e2892a4df61a10de60eb875309ae9db9c20cd6700a72540cbeb49e303a297d830281b4
 MISC metadata.xml 339 BLAKE2B bf7648aaefd8e1834d8d0faf1307566a068bffc3873942b6c799124486a369df38f2defae61afb67c51ed4750b77ee68ab163d1510b6ea0dedb3867bfa9a29e2 SHA512 70bde02b98edb10a9340db05de2bac26828bafd43be3fe2796a4cc8c115b409eac13c0eecd0ecb038f49f6eaa2bd6588671afff450fef02c0301356323216d51
diff --git a/dev-ros/tf2/files/logging2.patch b/dev-ros/tf2/files/logging2.patch
new file mode 100644
index 000000000000..38a3ee3c0bb6
--- /dev/null
+++ b/dev-ros/tf2/files/logging2.patch
@@ -0,0 +1,98 @@
+Index: tf2/src/buffer_core.cpp
+===================================================================
+--- tf2.orig/src/buffer_core.cpp
++++ tf2/src/buffer_core.cpp
+@@ -123,7 +123,7 @@ bool BufferCore::warnFrameId(const char*
+   {
+     std::stringstream ss;
+     ss << "Invalid argument passed to "<< function_name_arg <<" in tf2 frame_ids cannot be empty";
+-    logWarn("%s",ss.str().c_str());
++    CONSOLE_BRIDGE_logWarn("%s",ss.str().c_str());
+     return true;
+   }
+ 
+@@ -131,7 +131,7 @@ bool BufferCore::warnFrameId(const char*
+   {
+     std::stringstream ss;
+     ss << "Invalid argument \"" << frame_id << "\" passed to "<< function_name_arg <<" in tf2 frame_ids cannot start with a '/' like: ";
+-    logWarn("%s",ss.str().c_str());
++    CONSOLE_BRIDGE_logWarn("%s",ss.str().c_str());
+     return true;
+   }
+ 
+@@ -218,26 +218,26 @@ bool BufferCore::setTransform(const geom
+   bool error_exists = false;
+   if (stripped.child_frame_id == stripped.header.frame_id)
+   {
+-    logError("TF_SELF_TRANSFORM: Ignoring transform from authority \"%s\" with frame_id and child_frame_id  \"%s\" because they are the same",  authority.c_str(), stripped.child_frame_id.c_str());
++    CONSOLE_BRIDGE_logError("TF_SELF_TRANSFORM: Ignoring transform from authority \"%s\" with frame_id and child_frame_id  \"%s\" because they are the same",  authority.c_str(), stripped.child_frame_id.c_str());
+     error_exists = true;
+   }
+ 
+   if (stripped.child_frame_id == "")
+   {
+-    logError("TF_NO_CHILD_FRAME_ID: Ignoring transform from authority \"%s\" because child_frame_id not set ", authority.c_str());
++    CONSOLE_BRIDGE_logError("TF_NO_CHILD_FRAME_ID: Ignoring transform from authority \"%s\" because child_frame_id not set ", authority.c_str());
+     error_exists = true;
+   }
+ 
+   if (stripped.header.frame_id == "")
+   {
+-    logError("TF_NO_FRAME_ID: Ignoring transform with child_frame_id \"%s\"  from authority \"%s\" because frame_id not set", stripped.child_frame_id.c_str(), authority.c_str());
++    CONSOLE_BRIDGE_logError("TF_NO_FRAME_ID: Ignoring transform with child_frame_id \"%s\"  from authority \"%s\" because frame_id not set", stripped.child_frame_id.c_str(), authority.c_str());
+     error_exists = true;
+   }
+ 
+   if (std::isnan(stripped.transform.translation.x) || std::isnan(stripped.transform.translation.y) || std::isnan(stripped.transform.translation.z)||
+       std::isnan(stripped.transform.rotation.x) ||       std::isnan(stripped.transform.rotation.y) ||       std::isnan(stripped.transform.rotation.z) ||       std::isnan(stripped.transform.rotation.w))
+   {
+-    logError("TF_NAN_INPUT: Ignoring transform for child_frame_id \"%s\" from authority \"%s\" because of a nan value in the transform (%f %f %f) (%f %f %f %f)",
++    CONSOLE_BRIDGE_logError("TF_NAN_INPUT: Ignoring transform for child_frame_id \"%s\" from authority \"%s\" because of a nan value in the transform (%f %f %f) (%f %f %f %f)",
+               stripped.child_frame_id.c_str(), authority.c_str(),
+               stripped.transform.translation.x, stripped.transform.translation.y, stripped.transform.translation.z,
+               stripped.transform.rotation.x, stripped.transform.rotation.y, stripped.transform.rotation.z, stripped.transform.rotation.w
+@@ -252,7 +252,7 @@ bool BufferCore::setTransform(const geom
+ 
+   if (!valid) 
+   {
+-    logError("TF_DENORMALIZED_QUATERNION: Ignoring transform for child_frame_id \"%s\" from authority \"%s\" because of an invalid quaternion in the transform (%f %f %f %f)",
++    CONSOLE_BRIDGE_logError("TF_DENORMALIZED_QUATERNION: Ignoring transform for child_frame_id \"%s\" from authority \"%s\" because of an invalid quaternion in the transform (%f %f %f %f)",
+              stripped.child_frame_id.c_str(), authority.c_str(),
+              stripped.transform.rotation.x, stripped.transform.rotation.y, stripped.transform.rotation.z, stripped.transform.rotation.w);
+     error_exists = true;
+@@ -274,7 +274,7 @@ bool BufferCore::setTransform(const geom
+     }
+     else
+     {
+-      logWarn("TF_OLD_DATA ignoring data from the past for frame %s at time %g according to authority %s\nPossible reasons are listed at http://wiki.ros.org/tf/Errors%%20explained", stripped.child_frame_id.c_str(), stripped.header.stamp.toSec(), authority.c_str());
++      CONSOLE_BRIDGE_logWarn("TF_OLD_DATA ignoring data from the past for frame %s at time %g according to authority %s\nPossible reasons are listed at http://wiki.ros.org/tf/Errors%%20explained", stripped.child_frame_id.c_str(), stripped.header.stamp.toSec(), authority.c_str());
+       return false;
+     }
+   }
+@@ -633,7 +633,7 @@ geometry_msgs::TransformStamped BufferCo
+     case tf2_msgs::TF2Error::LOOKUP_ERROR:
+       throw LookupException(error_string);
+     default:
+-      logError("Unknown error code: %d", retval);
++      CONSOLE_BRIDGE_logError("Unknown error code: %d", retval);
+       assert(0);
+     }
+   }
+@@ -1604,7 +1604,7 @@ void BufferCore::_chainAsVector(const st
+     case tf2_msgs::TF2Error::LOOKUP_ERROR:
+       throw LookupException(error_string);
+     default:
+-      logError("Unknown error code: %d", retval);
++      CONSOLE_BRIDGE_logError("Unknown error code: %d", retval);
+       assert(0);
+     }
+   }
+@@ -1623,7 +1623,7 @@ void BufferCore::_chainAsVector(const st
+     case tf2_msgs::TF2Error::LOOKUP_ERROR:
+       throw LookupException(error_string);
+     default:
+-      logError("Unknown error code: %d", retval);
++      CONSOLE_BRIDGE_logError("Unknown error code: %d", retval);
+       assert(0);
+     }
+   }
diff --git a/dev-ros/tf2/tf2-0.5.17.ebuild b/dev-ros/tf2/tf2-0.5.17.ebuild
new file mode 100644
index 000000000000..775ef1258bc2
--- /dev/null
+++ b/dev-ros/tf2/tf2-0.5.17.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="The second generation Transform Library in ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/console_bridge:=
+	dev-ros/rostime
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/roscpp )
+"
+PATCHES=( "${FILESDIR}/logging2.patch" )
diff --git a/dev-ros/tf2_bullet/Manifest b/dev-ros/tf2_bullet/Manifest
index f417be5c69bb..afb153289487 100644
--- a/dev-ros/tf2_bullet/Manifest
+++ b/dev-ros/tf2_bullet/Manifest
@@ -1,6 +1,7 @@
 DIST geometry2-0.5.14.tar.gz 147162 BLAKE2B 9034e37e099e601323ad7bd7ca167a93dd40143efe2e9d202f61cf2740f02f537f3880df87d41ec377e09f9d31914c164a8fe0f94f3cdea23a7d1c4bd98098d5 SHA512 1e32dbfbd46a2d72dcc53cf67914bdc6bd1907cf8d9b6c24c5b73e9738a7068b1b974ea434a267f907f276bf70b85f7169d85679449402e0808edadb9fe21e82
 DIST geometry2-0.5.15.tar.gz 147275 BLAKE2B 27a520d7c76eeea551d95092ede446f2badaee72b72ff24936a2116a0fa824d3f83afa7b07c5d962824e163a4d470490a0d68a8026e9bf829e87d1008b88ddc3 SHA512 10a750948157904c0812aaae85e21eaf5c85dfef3770d418fd0c592a9179cef9fc2082ecc125be0fd0032e705dfb678d45930d3aa2cd0986a71c2e0a7307722c
 DIST geometry2-0.5.16.tar.gz 154351 BLAKE2B e630be09da6de544de0215d40ffcb0aa780be253320264d52603d5fe7506d12b27e986acb9c036973ba390c5cd96b5e838849ee2f5b1399148cf5cffb461cd76 SHA512 11909db98af78bbdef8d1a7dc5f20d3ff3cfcb0afc0e1d53b97a1ffe99aecea911f09364593eb232d7514a4caa192141404d892a33fc7ea9f5ce924ecf99fc51
+DIST geometry2-0.5.17.tar.gz 156516 BLAKE2B 72f936086fe3dbcfa3c05f7ae72e64f20fd1525513e79ed9c4dae7c5b097501ea230c483a3f1eb6e0ba6a342e0ddc5deacf05ec9f0c97b56df48dcf2bf669e8b SHA512 44d91796f03d0cbd8a9247568827dca4a848ec931fa754fd7815e9102f7bcac38e85ebcc27e3037827358dbfbc7d58b28775f00e1e04c48125e56c7b97cde925
 DIST geometry_experimental-0.5.12.tar.gz 131234 BLAKE2B 1b4a32aec39ed5e53c6bd7b91a85e5667202c59d9e6b2854dab8ced87968cdce71aa2cf7e6e40d6d8b34ae30faf38263a9cec04111f03f17f66bf34563c4728d SHA512 1a1a33db529d0810661c020552642d914de01a14e5b17b611fb7743a795c47e3f68d480ee4544b4ad86f7b1c947ea8b23cda09535ce046fdc45da1c40fc34711
 DIST geometry_experimental-0.5.13.tar.gz 134107 BLAKE2B eeeca3cd764775e6fc2ab73147b033a1bcb39a57a72516690772f40e7fca2d26d85e66cbf3a37a0a56d8be3e7239c1996344a40b94a82e2591bbc141e94c8fe4 SHA512 5b31a2ec2c8f852934c1c9a6aa0127c96b8f334f178742111c673195562a240649ac11ddde8d9738defae99184bdd83a57430fe6f17eb4cbd08ae600bfa7d43d
 EBUILD tf2_bullet-0.5.12.ebuild 415 BLAKE2B fd0fffcd4de3d5694d55c841025db6be2ad9f24f1983bc3af418e06044296480397cb39d7efa01bb4cdef4f0f0bcd533cd5a034c72a61b48ec57766266c015a8 SHA512 81fb51bd2c1d18d111f665ae8186c463c37dd4f19ea4902a07d016f133bbd963c1ef0081c01c919be6452bb718ce38fdaa5b1faf7798ba7750fc685c767e80d8
@@ -8,5 +9,6 @@ EBUILD tf2_bullet-0.5.13.ebuild 415 BLAKE2B fd0fffcd4de3d5694d55c841025db6be2ad9
 EBUILD tf2_bullet-0.5.14.ebuild 403 BLAKE2B 5cd722d732fcbda57a1712a1154c25c7ca071a7f9f98bad333f88ba9bbce875f96c06c6d5174e2da844aefd5592b2010dbbedd501599afd10c8639e4c0726249 SHA512 cb8dc5dde03d9a367af2b78fe5e9a06477703a019b0f3229faac68df0ba1b11313af9d0fce4751202a5302c25373405c616b5a67a0625bb105638f2a038c1a96
 EBUILD tf2_bullet-0.5.15.ebuild 403 BLAKE2B 5cd722d732fcbda57a1712a1154c25c7ca071a7f9f98bad333f88ba9bbce875f96c06c6d5174e2da844aefd5592b2010dbbedd501599afd10c8639e4c0726249 SHA512 cb8dc5dde03d9a367af2b78fe5e9a06477703a019b0f3229faac68df0ba1b11313af9d0fce4751202a5302c25373405c616b5a67a0625bb105638f2a038c1a96
 EBUILD tf2_bullet-0.5.16.ebuild 403 BLAKE2B 5cd722d732fcbda57a1712a1154c25c7ca071a7f9f98bad333f88ba9bbce875f96c06c6d5174e2da844aefd5592b2010dbbedd501599afd10c8639e4c0726249 SHA512 cb8dc5dde03d9a367af2b78fe5e9a06477703a019b0f3229faac68df0ba1b11313af9d0fce4751202a5302c25373405c616b5a67a0625bb105638f2a038c1a96
+EBUILD tf2_bullet-0.5.17.ebuild 403 BLAKE2B 82c635f27e043327f7d158193ac5f8c438c676fe9cd30c956542454ca394061ab9c843ac019bab431c1cac7aa24f2e5a6fe1ab069707b0eeb13aed93c3a3e111 SHA512 7f566040c785caef269f23555d183c4c7a3dae5bcff0cf0d9cc4d6a4d18c782fbe68d7134b0b81d7c132129f67ad64800c90ef3dbc67b5263c54bdb3372ab82f
 EBUILD tf2_bullet-9999.ebuild 403 BLAKE2B 5cd722d732fcbda57a1712a1154c25c7ca071a7f9f98bad333f88ba9bbce875f96c06c6d5174e2da844aefd5592b2010dbbedd501599afd10c8639e4c0726249 SHA512 cb8dc5dde03d9a367af2b78fe5e9a06477703a019b0f3229faac68df0ba1b11313af9d0fce4751202a5302c25373405c616b5a67a0625bb105638f2a038c1a96
 MISC metadata.xml 339 BLAKE2B bf7648aaefd8e1834d8d0faf1307566a068bffc3873942b6c799124486a369df38f2defae61afb67c51ed4750b77ee68ab163d1510b6ea0dedb3867bfa9a29e2 SHA512 70bde02b98edb10a9340db05de2bac26828bafd43be3fe2796a4cc8c115b409eac13c0eecd0ecb038f49f6eaa2bd6588671afff450fef02c0301356323216d51
diff --git a/dev-ros/tf2_bullet/tf2_bullet-0.5.17.ebuild b/dev-ros/tf2_bullet/tf2_bullet-0.5.17.ebuild
new file mode 100644
index 000000000000..cff2733f7c12
--- /dev/null
+++ b/dev-ros/tf2_bullet/tf2_bullet-0.5.17.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 bullet support"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf2
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	sci-physics/bullet
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_eigen/Manifest b/dev-ros/tf2_eigen/Manifest
index 80a66cc8ab7a..d7876ca7095c 100644
--- a/dev-ros/tf2_eigen/Manifest
+++ b/dev-ros/tf2_eigen/Manifest
@@ -2,9 +2,11 @@ DIST geometry2-0.5.13.tar.gz 134172 BLAKE2B d1df88906b8e61a9e199299b28526ce81124
 DIST geometry2-0.5.14.tar.gz 147162 BLAKE2B 9034e37e099e601323ad7bd7ca167a93dd40143efe2e9d202f61cf2740f02f537f3880df87d41ec377e09f9d31914c164a8fe0f94f3cdea23a7d1c4bd98098d5 SHA512 1e32dbfbd46a2d72dcc53cf67914bdc6bd1907cf8d9b6c24c5b73e9738a7068b1b974ea434a267f907f276bf70b85f7169d85679449402e0808edadb9fe21e82
 DIST geometry2-0.5.15.tar.gz 147275 BLAKE2B 27a520d7c76eeea551d95092ede446f2badaee72b72ff24936a2116a0fa824d3f83afa7b07c5d962824e163a4d470490a0d68a8026e9bf829e87d1008b88ddc3 SHA512 10a750948157904c0812aaae85e21eaf5c85dfef3770d418fd0c592a9179cef9fc2082ecc125be0fd0032e705dfb678d45930d3aa2cd0986a71c2e0a7307722c
 DIST geometry2-0.5.16.tar.gz 154351 BLAKE2B e630be09da6de544de0215d40ffcb0aa780be253320264d52603d5fe7506d12b27e986acb9c036973ba390c5cd96b5e838849ee2f5b1399148cf5cffb461cd76 SHA512 11909db98af78bbdef8d1a7dc5f20d3ff3cfcb0afc0e1d53b97a1ffe99aecea911f09364593eb232d7514a4caa192141404d892a33fc7ea9f5ce924ecf99fc51
+DIST geometry2-0.5.17.tar.gz 156516 BLAKE2B 72f936086fe3dbcfa3c05f7ae72e64f20fd1525513e79ed9c4dae7c5b097501ea230c483a3f1eb6e0ba6a342e0ddc5deacf05ec9f0c97b56df48dcf2bf669e8b SHA512 44d91796f03d0cbd8a9247568827dca4a848ec931fa754fd7815e9102f7bcac38e85ebcc27e3037827358dbfbc7d58b28775f00e1e04c48125e56c7b97cde925
 EBUILD tf2_eigen-0.5.13.ebuild 426 BLAKE2B ad08ef9dcc12fbc23f846f04e65cd59d2826b99441a05f55ea4cce8c8686956ef3ebd15dfdbd7999de9a89c4c34bdb9476119869dc0213194366735fee2c4828 SHA512 59af992a1e2c160faa74d9f9c7ad06cc95ef4726062726044865da407147e92e0fca5eb32a4b5261d35fbe61288de6d78f1813ebf124a6a2a741cd6219e36774
 EBUILD tf2_eigen-0.5.14.ebuild 426 BLAKE2B e6eed3cda445dc16769616a5ed6c308498ed4b7d3aaa1d6c94fbb7ff708a7beb375e26e5c6132992b931c3dc10349a1fda156f73162574627942a38faf25b8d7 SHA512 a090b8db826438ee22777efe6ca68ddbccee327a6eb68702ea415b87a74000b6c4d084313db5f481a4bbd898591a95a8677f99ba114f34dd61d7b14c611fa359
 EBUILD tf2_eigen-0.5.15.ebuild 426 BLAKE2B e6eed3cda445dc16769616a5ed6c308498ed4b7d3aaa1d6c94fbb7ff708a7beb375e26e5c6132992b931c3dc10349a1fda156f73162574627942a38faf25b8d7 SHA512 a090b8db826438ee22777efe6ca68ddbccee327a6eb68702ea415b87a74000b6c4d084313db5f481a4bbd898591a95a8677f99ba114f34dd61d7b14c611fa359
 EBUILD tf2_eigen-0.5.16.ebuild 426 BLAKE2B e6eed3cda445dc16769616a5ed6c308498ed4b7d3aaa1d6c94fbb7ff708a7beb375e26e5c6132992b931c3dc10349a1fda156f73162574627942a38faf25b8d7 SHA512 a090b8db826438ee22777efe6ca68ddbccee327a6eb68702ea415b87a74000b6c4d084313db5f481a4bbd898591a95a8677f99ba114f34dd61d7b14c611fa359
+EBUILD tf2_eigen-0.5.17.ebuild 426 BLAKE2B 396fa885cab72c2e60ef49db22e97cabf953a0178955c1e12e88362589d5201a9e77401af867a19946cd6287795812cc5d9d78f21781cb22979c3676c446fcfe SHA512 4c19f01cae4b2c61db270a34a5ee284fbc838e86451b9a66c7da93d9eba1fd605ff862960556d02f707cc9f1a0ce568c7e4965bd7dc9ed4f20783962f869be7f
 EBUILD tf2_eigen-9999.ebuild 426 BLAKE2B ad08ef9dcc12fbc23f846f04e65cd59d2826b99441a05f55ea4cce8c8686956ef3ebd15dfdbd7999de9a89c4c34bdb9476119869dc0213194366735fee2c4828 SHA512 59af992a1e2c160faa74d9f9c7ad06cc95ef4726062726044865da407147e92e0fca5eb32a4b5261d35fbe61288de6d78f1813ebf124a6a2a741cd6219e36774
 MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_eigen/tf2_eigen-0.5.17.ebuild b/dev-ros/tf2_eigen/tf2_eigen-0.5.17.ebuild
new file mode 100644
index 000000000000..b3071940cfb2
--- /dev/null
+++ b/dev-ros/tf2_eigen/tf2_eigen-0.5.17.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 eigen support"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-ros/tf2
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND} dev-ros/cmake_modules"
diff --git a/dev-ros/tf2_geometry_msgs/Manifest b/dev-ros/tf2_geometry_msgs/Manifest
index 3fd5f9b05138..0edc3fa40f78 100644
--- a/dev-ros/tf2_geometry_msgs/Manifest
+++ b/dev-ros/tf2_geometry_msgs/Manifest
@@ -1,6 +1,7 @@
 DIST geometry2-0.5.14.tar.gz 147162 BLAKE2B 9034e37e099e601323ad7bd7ca167a93dd40143efe2e9d202f61cf2740f02f537f3880df87d41ec377e09f9d31914c164a8fe0f94f3cdea23a7d1c4bd98098d5 SHA512 1e32dbfbd46a2d72dcc53cf67914bdc6bd1907cf8d9b6c24c5b73e9738a7068b1b974ea434a267f907f276bf70b85f7169d85679449402e0808edadb9fe21e82
 DIST geometry2-0.5.15.tar.gz 147275 BLAKE2B 27a520d7c76eeea551d95092ede446f2badaee72b72ff24936a2116a0fa824d3f83afa7b07c5d962824e163a4d470490a0d68a8026e9bf829e87d1008b88ddc3 SHA512 10a750948157904c0812aaae85e21eaf5c85dfef3770d418fd0c592a9179cef9fc2082ecc125be0fd0032e705dfb678d45930d3aa2cd0986a71c2e0a7307722c
 DIST geometry2-0.5.16.tar.gz 154351 BLAKE2B e630be09da6de544de0215d40ffcb0aa780be253320264d52603d5fe7506d12b27e986acb9c036973ba390c5cd96b5e838849ee2f5b1399148cf5cffb461cd76 SHA512 11909db98af78bbdef8d1a7dc5f20d3ff3cfcb0afc0e1d53b97a1ffe99aecea911f09364593eb232d7514a4caa192141404d892a33fc7ea9f5ce924ecf99fc51
+DIST geometry2-0.5.17.tar.gz 156516 BLAKE2B 72f936086fe3dbcfa3c05f7ae72e64f20fd1525513e79ed9c4dae7c5b097501ea230c483a3f1eb6e0ba6a342e0ddc5deacf05ec9f0c97b56df48dcf2bf669e8b SHA512 44d91796f03d0cbd8a9247568827dca4a848ec931fa754fd7815e9102f7bcac38e85ebcc27e3037827358dbfbc7d58b28775f00e1e04c48125e56c7b97cde925
 DIST geometry_experimental-0.5.12.tar.gz 131234 BLAKE2B 1b4a32aec39ed5e53c6bd7b91a85e5667202c59d9e6b2854dab8ced87968cdce71aa2cf7e6e40d6d8b34ae30faf38263a9cec04111f03f17f66bf34563c4728d SHA512 1a1a33db529d0810661c020552642d914de01a14e5b17b611fb7743a795c47e3f68d480ee4544b4ad86f7b1c947ea8b23cda09535ce046fdc45da1c40fc34711
 DIST geometry_experimental-0.5.13.tar.gz 134107 BLAKE2B eeeca3cd764775e6fc2ab73147b033a1bcb39a57a72516690772f40e7fca2d26d85e66cbf3a37a0a56d8be3e7239c1996344a40b94a82e2591bbc141e94c8fe4 SHA512 5b31a2ec2c8f852934c1c9a6aa0127c96b8f334f178742111c673195562a240649ac11ddde8d9738defae99184bdd83a57430fe6f17eb4cbd08ae600bfa7d43d
 EBUILD tf2_geometry_msgs-0.5.12.ebuild 626 BLAKE2B 8f9090af33e63346fd4837b46455beddc849e8b1bb8286e04f48bb0bddf7bd7fafdc9f63c3fee0cef198e0d450e09f09fd295345a91545b09476853b6df943a9 SHA512 264feee516e376d8fe8a9dcdb4d1dfdaf47c02abe302ce8528322c387e9be0f54c815e31ab9d90b0758c376270bbc6d52037cc0808b1ec9d180810b60803ccb7
@@ -8,5 +9,6 @@ EBUILD tf2_geometry_msgs-0.5.13.ebuild 626 BLAKE2B 8f9090af33e63346fd4837b46455b
 EBUILD tf2_geometry_msgs-0.5.14.ebuild 614 BLAKE2B 7053d0094ef827c41d26d6e75fecc146e6ae8ed1048bd3af63b26fc20a9e1eb2572e8002962e53f8b470a4150260b58a6554ce64edba2fc2afd9a8d305c4a5b9 SHA512 a38c116f128ff62c7662345a2e41793171e4e9e73f53568aac97e570b073e0f170f57b254d326e0e89c2f6ab74364a9d71fbe9fbb4a0fba093fcbf804064b9f1
 EBUILD tf2_geometry_msgs-0.5.15.ebuild 614 BLAKE2B 7053d0094ef827c41d26d6e75fecc146e6ae8ed1048bd3af63b26fc20a9e1eb2572e8002962e53f8b470a4150260b58a6554ce64edba2fc2afd9a8d305c4a5b9 SHA512 a38c116f128ff62c7662345a2e41793171e4e9e73f53568aac97e570b073e0f170f57b254d326e0e89c2f6ab74364a9d71fbe9fbb4a0fba093fcbf804064b9f1
 EBUILD tf2_geometry_msgs-0.5.16.ebuild 614 BLAKE2B 7053d0094ef827c41d26d6e75fecc146e6ae8ed1048bd3af63b26fc20a9e1eb2572e8002962e53f8b470a4150260b58a6554ce64edba2fc2afd9a8d305c4a5b9 SHA512 a38c116f128ff62c7662345a2e41793171e4e9e73f53568aac97e570b073e0f170f57b254d326e0e89c2f6ab74364a9d71fbe9fbb4a0fba093fcbf804064b9f1
+EBUILD tf2_geometry_msgs-0.5.17.ebuild 614 BLAKE2B 0e8c3201cf166c33334d1cbdf97f60472b074a391bf5d2231319a7067bc4bd5dfbed5d42ef7491e2e3e33a5eb33f7483c184affb592a2634dbe5fca0bd358596 SHA512 af0cc5f55216553c84a8b856fde88af85ee0cb745e4339f2d256c55001b46beb81d4c810bcfdc43f2721c8e29d6ea2ecbccc5a53779573f6635005f91fe7c407
 EBUILD tf2_geometry_msgs-9999.ebuild 614 BLAKE2B 7053d0094ef827c41d26d6e75fecc146e6ae8ed1048bd3af63b26fc20a9e1eb2572e8002962e53f8b470a4150260b58a6554ce64edba2fc2afd9a8d305c4a5b9 SHA512 a38c116f128ff62c7662345a2e41793171e4e9e73f53568aac97e570b073e0f170f57b254d326e0e89c2f6ab74364a9d71fbe9fbb4a0fba093fcbf804064b9f1
 MISC metadata.xml 339 BLAKE2B bf7648aaefd8e1834d8d0faf1307566a068bffc3873942b6c799124486a369df38f2defae61afb67c51ed4750b77ee68ab163d1510b6ea0dedb3867bfa9a29e2 SHA512 70bde02b98edb10a9340db05de2bac26828bafd43be3fe2796a4cc8c115b409eac13c0eecd0ecb038f49f6eaa2bd6588671afff450fef02c0301356323216d51
diff --git a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.5.17.ebuild b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.5.17.ebuild
new file mode 100644
index 000000000000..6e110987c542
--- /dev/null
+++ b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.5.17.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="The second generation Transform Library in ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/tf2_ros[${PYTHON_USEDEP}]
+	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+	dev-ros/tf2
+	sci-libs/orocos_kdl
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_kdl/Manifest b/dev-ros/tf2_kdl/Manifest
index fbb17335559c..7481d6e38151 100644
--- a/dev-ros/tf2_kdl/Manifest
+++ b/dev-ros/tf2_kdl/Manifest
@@ -1,6 +1,8 @@
 DIST geometry2-0.5.15.tar.gz 147275 BLAKE2B 27a520d7c76eeea551d95092ede446f2badaee72b72ff24936a2116a0fa824d3f83afa7b07c5d962824e163a4d470490a0d68a8026e9bf829e87d1008b88ddc3 SHA512 10a750948157904c0812aaae85e21eaf5c85dfef3770d418fd0c592a9179cef9fc2082ecc125be0fd0032e705dfb678d45930d3aa2cd0986a71c2e0a7307722c
 DIST geometry2-0.5.16.tar.gz 154351 BLAKE2B e630be09da6de544de0215d40ffcb0aa780be253320264d52603d5fe7506d12b27e986acb9c036973ba390c5cd96b5e838849ee2f5b1399148cf5cffb461cd76 SHA512 11909db98af78bbdef8d1a7dc5f20d3ff3cfcb0afc0e1d53b97a1ffe99aecea911f09364593eb232d7514a4caa192141404d892a33fc7ea9f5ce924ecf99fc51
+DIST geometry2-0.5.17.tar.gz 156516 BLAKE2B 72f936086fe3dbcfa3c05f7ae72e64f20fd1525513e79ed9c4dae7c5b097501ea230c483a3f1eb6e0ba6a342e0ddc5deacf05ec9f0c97b56df48dcf2bf669e8b SHA512 44d91796f03d0cbd8a9247568827dca4a848ec931fa754fd7815e9102f7bcac38e85ebcc27e3037827358dbfbc7d58b28775f00e1e04c48125e56c7b97cde925
 EBUILD tf2_kdl-0.5.15.ebuild 589 BLAKE2B b9d3f303755e8292a428fddbf307c4e0133e5f34d925045325acc6988c4a89e7b857aa37d7e8a6897cfe58141136ddabb0ed00c84ba42a1d0e9d7c6cb90961bf SHA512 558c1ce2013035974680f497745da6e766c15977b4f01fcc4bcfdfd9d3af1b25126342447ef91e2ed0b0ce11c8cf8b57a015fdd16d32608c57aea1a0d4924537
 EBUILD tf2_kdl-0.5.16.ebuild 589 BLAKE2B b9d3f303755e8292a428fddbf307c4e0133e5f34d925045325acc6988c4a89e7b857aa37d7e8a6897cfe58141136ddabb0ed00c84ba42a1d0e9d7c6cb90961bf SHA512 558c1ce2013035974680f497745da6e766c15977b4f01fcc4bcfdfd9d3af1b25126342447ef91e2ed0b0ce11c8cf8b57a015fdd16d32608c57aea1a0d4924537
+EBUILD tf2_kdl-0.5.17.ebuild 589 BLAKE2B 2ae4b703b7239d383fca1d3e8f820e13b7b9ac4b3002048af555ced6e23b84f98d6aab781a05f00556edc66713c275e4ea412190f03db7a30e893ac06c397597 SHA512 2d4ca8365cc27d1e32ff8bb3f22f08f096831fb593d92f10ce4ea4d71ce28fd2324a564d1a0cabcf3603bc5bf5e0a614eabd32fc36878afef9f013bc2bdfe2ca
 EBUILD tf2_kdl-9999.ebuild 589 BLAKE2B b9d3f303755e8292a428fddbf307c4e0133e5f34d925045325acc6988c4a89e7b857aa37d7e8a6897cfe58141136ddabb0ed00c84ba42a1d0e9d7c6cb90961bf SHA512 558c1ce2013035974680f497745da6e766c15977b4f01fcc4bcfdfd9d3af1b25126342447ef91e2ed0b0ce11c8cf8b57a015fdd16d32608c57aea1a0d4924537
 MISC metadata.xml 339 BLAKE2B bf7648aaefd8e1834d8d0faf1307566a068bffc3873942b6c799124486a369df38f2defae61afb67c51ed4750b77ee68ab163d1510b6ea0dedb3867bfa9a29e2 SHA512 70bde02b98edb10a9340db05de2bac26828bafd43be3fe2796a4cc8c115b409eac13c0eecd0ecb038f49f6eaa2bd6588671afff450fef02c0301356323216d51
diff --git a/dev-ros/tf2_kdl/tf2_kdl-0.5.17.ebuild b/dev-ros/tf2_kdl/tf2_kdl-0.5.17.ebuild
new file mode 100644
index 000000000000..f82f2ff4e47a
--- /dev/null
+++ b/dev-ros/tf2_kdl/tf2_kdl-0.5.17.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="KDL binding for tf2"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-ros/tf2
+	dev-ros/tf2_ros
+	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+	sci-libs/orocos_kdl
+	dev-ros/tf2_msgs[${PYTHON_USEDEP}]
+	dev-ros/cmake_modules
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-cpp/gtest
+	)"
diff --git a/dev-ros/tf2_msgs/Manifest b/dev-ros/tf2_msgs/Manifest
index e36162879daa..15810da57780 100644
--- a/dev-ros/tf2_msgs/Manifest
+++ b/dev-ros/tf2_msgs/Manifest
@@ -1,6 +1,7 @@
 DIST geometry2-0.5.14.tar.gz 147162 BLAKE2B 9034e37e099e601323ad7bd7ca167a93dd40143efe2e9d202f61cf2740f02f537f3880df87d41ec377e09f9d31914c164a8fe0f94f3cdea23a7d1c4bd98098d5 SHA512 1e32dbfbd46a2d72dcc53cf67914bdc6bd1907cf8d9b6c24c5b73e9738a7068b1b974ea434a267f907f276bf70b85f7169d85679449402e0808edadb9fe21e82
 DIST geometry2-0.5.15.tar.gz 147275 BLAKE2B 27a520d7c76eeea551d95092ede446f2badaee72b72ff24936a2116a0fa824d3f83afa7b07c5d962824e163a4d470490a0d68a8026e9bf829e87d1008b88ddc3 SHA512 10a750948157904c0812aaae85e21eaf5c85dfef3770d418fd0c592a9179cef9fc2082ecc125be0fd0032e705dfb678d45930d3aa2cd0986a71c2e0a7307722c
 DIST geometry2-0.5.16.tar.gz 154351 BLAKE2B e630be09da6de544de0215d40ffcb0aa780be253320264d52603d5fe7506d12b27e986acb9c036973ba390c5cd96b5e838849ee2f5b1399148cf5cffb461cd76 SHA512 11909db98af78bbdef8d1a7dc5f20d3ff3cfcb0afc0e1d53b97a1ffe99aecea911f09364593eb232d7514a4caa192141404d892a33fc7ea9f5ce924ecf99fc51
+DIST geometry2-0.5.17.tar.gz 156516 BLAKE2B 72f936086fe3dbcfa3c05f7ae72e64f20fd1525513e79ed9c4dae7c5b097501ea230c483a3f1eb6e0ba6a342e0ddc5deacf05ec9f0c97b56df48dcf2bf669e8b SHA512 44d91796f03d0cbd8a9247568827dca4a848ec931fa754fd7815e9102f7bcac38e85ebcc27e3037827358dbfbc7d58b28775f00e1e04c48125e56c7b97cde925
 DIST geometry_experimental-0.5.12.tar.gz 131234 BLAKE2B 1b4a32aec39ed5e53c6bd7b91a85e5667202c59d9e6b2854dab8ced87968cdce71aa2cf7e6e40d6d8b34ae30faf38263a9cec04111f03f17f66bf34563c4728d SHA512 1a1a33db529d0810661c020552642d914de01a14e5b17b611fb7743a795c47e3f68d480ee4544b4ad86f7b1c947ea8b23cda09535ce046fdc45da1c40fc34711
 DIST geometry_experimental-0.5.13.tar.gz 134107 BLAKE2B eeeca3cd764775e6fc2ab73147b033a1bcb39a57a72516690772f40e7fca2d26d85e66cbf3a37a0a56d8be3e7239c1996344a40b94a82e2591bbc141e94c8fe4 SHA512 5b31a2ec2c8f852934c1c9a6aa0127c96b8f334f178742111c673195562a240649ac11ddde8d9738defae99184bdd83a57430fe6f17eb4cbd08ae600bfa7d43d
 EBUILD tf2_msgs-0.5.12.ebuild 467 BLAKE2B bcf172f18cc325ad0ada1b70438bbda4895c5c827f937c96c472e80d810d00a5feebb178f096ea3ed3234827c367afe03cd795cd2662fa3fc9c03f771e3a187a SHA512 f25a3fc4ae89e3bf196b7ab83125f4d378feaf0aa655f55f325dd631c397fa736470173e2d2399814d5d92625c2c845249d0a72a443fa9180c02d4b22c88f302
@@ -8,5 +9,6 @@ EBUILD tf2_msgs-0.5.13.ebuild 467 BLAKE2B bcf172f18cc325ad0ada1b70438bbda4895c5c
 EBUILD tf2_msgs-0.5.14.ebuild 455 BLAKE2B 9a3af9fa5a8e52b29323685b113e0e4c91645488116e588fce6eb5abc8b9175461fd900ee9e45a43fbdced7890a644d6ac6566374f4b8df7fc1f4c85bb4128e7 SHA512 6574bbb6547e5c5537e2543d3f882d6d1b16d700834b628675fdb182d3f5227a100de0ca4b70e096d1223a8cb63f014e5334cb65a7883795407dec34863cda6b
 EBUILD tf2_msgs-0.5.15.ebuild 455 BLAKE2B 9a3af9fa5a8e52b29323685b113e0e4c91645488116e588fce6eb5abc8b9175461fd900ee9e45a43fbdced7890a644d6ac6566374f4b8df7fc1f4c85bb4128e7 SHA512 6574bbb6547e5c5537e2543d3f882d6d1b16d700834b628675fdb182d3f5227a100de0ca4b70e096d1223a8cb63f014e5334cb65a7883795407dec34863cda6b
 EBUILD tf2_msgs-0.5.16.ebuild 455 BLAKE2B 9a3af9fa5a8e52b29323685b113e0e4c91645488116e588fce6eb5abc8b9175461fd900ee9e45a43fbdced7890a644d6ac6566374f4b8df7fc1f4c85bb4128e7 SHA512 6574bbb6547e5c5537e2543d3f882d6d1b16d700834b628675fdb182d3f5227a100de0ca4b70e096d1223a8cb63f014e5334cb65a7883795407dec34863cda6b
+EBUILD tf2_msgs-0.5.17.ebuild 455 BLAKE2B c35564ed41515f54b0b1647dd940bd8a8db6214a16f254b5dc80b0b9fe69f59f3c729b462126be1a88e4128ec9b96945c0012ac32d6a5d02c42e4b12cc6a1b91 SHA512 871ba088204e4cf4010302f205a54a21ff4d0c6695b1508f691f1e7aa7dff9072c2322c2b9a923a1cbacd53aaa61cf8538816fd4b111e574249170eafdfe5a5e
 EBUILD tf2_msgs-9999.ebuild 455 BLAKE2B 9a3af9fa5a8e52b29323685b113e0e4c91645488116e588fce6eb5abc8b9175461fd900ee9e45a43fbdced7890a644d6ac6566374f4b8df7fc1f4c85bb4128e7 SHA512 6574bbb6547e5c5537e2543d3f882d6d1b16d700834b628675fdb182d3f5227a100de0ca4b70e096d1223a8cb63f014e5334cb65a7883795407dec34863cda6b
 MISC metadata.xml 339 BLAKE2B bf7648aaefd8e1834d8d0faf1307566a068bffc3873942b6c799124486a369df38f2defae61afb67c51ed4750b77ee68ab163d1510b6ea0dedb3867bfa9a29e2 SHA512 70bde02b98edb10a9340db05de2bac26828bafd43be3fe2796a4cc8c115b409eac13c0eecd0ecb038f49f6eaa2bd6588671afff450fef02c0301356323216d51
diff --git a/dev-ros/tf2_msgs/tf2_msgs-0.5.17.ebuild b/dev-ros/tf2_msgs/tf2_msgs-0.5.17.ebuild
new file mode 100644
index 000000000000..ab26fd503c34
--- /dev/null
+++ b/dev-ros/tf2_msgs/tf2_msgs-0.5.17.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 messages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_py/Manifest b/dev-ros/tf2_py/Manifest
index e6cacd91bfa9..f507600630f7 100644
--- a/dev-ros/tf2_py/Manifest
+++ b/dev-ros/tf2_py/Manifest
@@ -1,4 +1,6 @@
 DIST geometry2-0.5.16.tar.gz 154351 BLAKE2B e630be09da6de544de0215d40ffcb0aa780be253320264d52603d5fe7506d12b27e986acb9c036973ba390c5cd96b5e838849ee2f5b1399148cf5cffb461cd76 SHA512 11909db98af78bbdef8d1a7dc5f20d3ff3cfcb0afc0e1d53b97a1ffe99aecea911f09364593eb232d7514a4caa192141404d892a33fc7ea9f5ce924ecf99fc51
+DIST geometry2-0.5.17.tar.gz 156516 BLAKE2B 72f936086fe3dbcfa3c05f7ae72e64f20fd1525513e79ed9c4dae7c5b097501ea230c483a3f1eb6e0ba6a342e0ddc5deacf05ec9f0c97b56df48dcf2bf669e8b SHA512 44d91796f03d0cbd8a9247568827dca4a848ec931fa754fd7815e9102f7bcac38e85ebcc27e3037827358dbfbc7d58b28775f00e1e04c48125e56c7b97cde925
 EBUILD tf2_py-0.5.16.ebuild 414 BLAKE2B ddfb7630d561add62cb401b565df834d0d9d824f64dc099aa4963aa92381c332b05f2766b8546d7f649175bcd3ae63ef40e4754b10493055cd722dc7cb97e678 SHA512 3ee385b68f0a48c25e018f179447ea8b8c747c7e6a144280d2ed373f542754325c3ae8de791df6c91cf9e2a1ace19a5a74397fe2fb65d1bb67b3ae00f6c97c5c
+EBUILD tf2_py-0.5.17.ebuild 414 BLAKE2B 93348fc5981f8d1947882242610ec34835c9fbc57e63db147d63e627311dd2a59463ad86734eb59d63ca568dcd0e47914a4b6628becf8fe03781e2bca28a6a05 SHA512 2d5d8540591e564816d98296a01eac4708e1ac3c1d5da370ca70b1f752304ed71019a3fba704db3729e8628d710b76d558f1b345f2bfd718f722def2b94a5036
 EBUILD tf2_py-9999.ebuild 414 BLAKE2B ddfb7630d561add62cb401b565df834d0d9d824f64dc099aa4963aa92381c332b05f2766b8546d7f649175bcd3ae63ef40e4754b10493055cd722dc7cb97e678 SHA512 3ee385b68f0a48c25e018f179447ea8b8c747c7e6a144280d2ed373f542754325c3ae8de791df6c91cf9e2a1ace19a5a74397fe2fb65d1bb67b3ae00f6c97c5c
 MISC metadata.xml 339 BLAKE2B bf7648aaefd8e1834d8d0faf1307566a068bffc3873942b6c799124486a369df38f2defae61afb67c51ed4750b77ee68ab163d1510b6ea0dedb3867bfa9a29e2 SHA512 70bde02b98edb10a9340db05de2bac26828bafd43be3fe2796a4cc8c115b409eac13c0eecd0ecb038f49f6eaa2bd6588671afff450fef02c0301356323216d51
diff --git a/dev-ros/tf2_py/tf2_py-0.5.17.ebuild b/dev-ros/tf2_py/tf2_py-0.5.17.ebuild
new file mode 100644
index 000000000000..97b18592a9a3
--- /dev/null
+++ b/dev-ros/tf2_py/tf2_py-0.5.17.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 python bindings"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf2
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_ros/Manifest b/dev-ros/tf2_ros/Manifest
index ed1c54105972..de6e33d9623e 100644
--- a/dev-ros/tf2_ros/Manifest
+++ b/dev-ros/tf2_ros/Manifest
@@ -1,10 +1,12 @@
 DIST geometry2-0.5.14.tar.gz 147162 BLAKE2B 9034e37e099e601323ad7bd7ca167a93dd40143efe2e9d202f61cf2740f02f537f3880df87d41ec377e09f9d31914c164a8fe0f94f3cdea23a7d1c4bd98098d5 SHA512 1e32dbfbd46a2d72dcc53cf67914bdc6bd1907cf8d9b6c24c5b73e9738a7068b1b974ea434a267f907f276bf70b85f7169d85679449402e0808edadb9fe21e82
 DIST geometry2-0.5.15.tar.gz 147275 BLAKE2B 27a520d7c76eeea551d95092ede446f2badaee72b72ff24936a2116a0fa824d3f83afa7b07c5d962824e163a4d470490a0d68a8026e9bf829e87d1008b88ddc3 SHA512 10a750948157904c0812aaae85e21eaf5c85dfef3770d418fd0c592a9179cef9fc2082ecc125be0fd0032e705dfb678d45930d3aa2cd0986a71c2e0a7307722c
 DIST geometry2-0.5.16.tar.gz 154351 BLAKE2B e630be09da6de544de0215d40ffcb0aa780be253320264d52603d5fe7506d12b27e986acb9c036973ba390c5cd96b5e838849ee2f5b1399148cf5cffb461cd76 SHA512 11909db98af78bbdef8d1a7dc5f20d3ff3cfcb0afc0e1d53b97a1ffe99aecea911f09364593eb232d7514a4caa192141404d892a33fc7ea9f5ce924ecf99fc51
+DIST geometry2-0.5.17.tar.gz 156516 BLAKE2B 72f936086fe3dbcfa3c05f7ae72e64f20fd1525513e79ed9c4dae7c5b097501ea230c483a3f1eb6e0ba6a342e0ddc5deacf05ec9f0c97b56df48dcf2bf669e8b SHA512 44d91796f03d0cbd8a9247568827dca4a848ec931fa754fd7815e9102f7bcac38e85ebcc27e3037827358dbfbc7d58b28775f00e1e04c48125e56c7b97cde925
 DIST geometry_experimental-0.5.13.tar.gz 134107 BLAKE2B eeeca3cd764775e6fc2ab73147b033a1bcb39a57a72516690772f40e7fca2d26d85e66cbf3a37a0a56d8be3e7239c1996344a40b94a82e2591bbc141e94c8fe4 SHA512 5b31a2ec2c8f852934c1c9a6aa0127c96b8f334f178742111c673195562a240649ac11ddde8d9738defae99184bdd83a57430fe6f17eb4cbd08ae600bfa7d43d
 EBUILD tf2_ros-0.5.13-r1.ebuild 875 BLAKE2B 799a02c28319c3395432a9f8fd7686a1116f058d1bf1d039be5a4437939c2720fee78e26ad8c81e151beb602fe9a11ba219a80415183cebc80caafc513cc05fa SHA512 87071b3cecc2ecc84497f30b3f3851662f60649e8caa1f3357c5885069ef6196f56f45f3f8b891b2f13fd2e9e7a27dd290228379bfc6d85ccebd775ebcf38470
 EBUILD tf2_ros-0.5.14.ebuild 863 BLAKE2B f456a8e3f159c2271d35970cc06c08880fc45d321b4bd35a1926102d008af02762fc1024ab0aa453150975634ea74d3bca4714ffdf5f09c2663be11ea6b0ddd2 SHA512 900d622cad352217d1a3211ed32a2002db47c032dfa8552a2c524e06de9c31ae8bd59c899285ad4e18ef656bb6afee11c1f583006a5ffa220f1657d3905906a4
 EBUILD tf2_ros-0.5.15.ebuild 863 BLAKE2B f456a8e3f159c2271d35970cc06c08880fc45d321b4bd35a1926102d008af02762fc1024ab0aa453150975634ea74d3bca4714ffdf5f09c2663be11ea6b0ddd2 SHA512 900d622cad352217d1a3211ed32a2002db47c032dfa8552a2c524e06de9c31ae8bd59c899285ad4e18ef656bb6afee11c1f583006a5ffa220f1657d3905906a4
 EBUILD tf2_ros-0.5.16.ebuild 863 BLAKE2B f456a8e3f159c2271d35970cc06c08880fc45d321b4bd35a1926102d008af02762fc1024ab0aa453150975634ea74d3bca4714ffdf5f09c2663be11ea6b0ddd2 SHA512 900d622cad352217d1a3211ed32a2002db47c032dfa8552a2c524e06de9c31ae8bd59c899285ad4e18ef656bb6afee11c1f583006a5ffa220f1657d3905906a4
+EBUILD tf2_ros-0.5.17.ebuild 863 BLAKE2B de1be6947d42661a1e4826884c1c4f9ebddbe0c506fc91e1cb40c2ff05d3c4a19265b6af56dc95258404cf3ad5a25607eaa5fe2515836870dc85bed771735986 SHA512 1f01d037cc92884ed61b4b15a9911e2d9a68152267612ebf7fc3785b89d2e6b738fa7f439c40bc59a071d859b638ed7e7e5b1e8e22b47d804fcbe1b7c76cc3bf
 EBUILD tf2_ros-9999.ebuild 863 BLAKE2B f456a8e3f159c2271d35970cc06c08880fc45d321b4bd35a1926102d008af02762fc1024ab0aa453150975634ea74d3bca4714ffdf5f09c2663be11ea6b0ddd2 SHA512 900d622cad352217d1a3211ed32a2002db47c032dfa8552a2c524e06de9c31ae8bd59c899285ad4e18ef656bb6afee11c1f583006a5ffa220f1657d3905906a4
 MISC metadata.xml 339 BLAKE2B bf7648aaefd8e1834d8d0faf1307566a068bffc3873942b6c799124486a369df38f2defae61afb67c51ed4750b77ee68ab163d1510b6ea0dedb3867bfa9a29e2 SHA512 70bde02b98edb10a9340db05de2bac26828bafd43be3fe2796a4cc8c115b409eac13c0eecd0ecb038f49f6eaa2bd6588671afff450fef02c0301356323216d51
diff --git a/dev-ros/tf2_ros/tf2_ros-0.5.17.ebuild b/dev-ros/tf2_ros/tf2_ros-0.5.17.ebuild
new file mode 100644
index 000000000000..0e85b91f5107
--- /dev/null
+++ b/dev-ros/tf2_ros/tf2_ros-0.5.17.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="ROS bindings for the tf2 library, for both Python and C++"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/actionlib[${PYTHON_USEDEP}]
+	dev-ros/message_filters
+	dev-ros/roscpp
+	dev-ros/rosgraph
+	dev-libs/boost:=[threads]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/tf2
+	dev-ros/tf2_py[${PYTHON_USEDEP}]
+	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/tf2_sensor_msgs/Manifest b/dev-ros/tf2_sensor_msgs/Manifest
index 2729f5b43e9e..0ef9f6e0b8fa 100644
--- a/dev-ros/tf2_sensor_msgs/Manifest
+++ b/dev-ros/tf2_sensor_msgs/Manifest
@@ -1,6 +1,8 @@
 DIST geometry2-0.5.15.tar.gz 147275 BLAKE2B 27a520d7c76eeea551d95092ede446f2badaee72b72ff24936a2116a0fa824d3f83afa7b07c5d962824e163a4d470490a0d68a8026e9bf829e87d1008b88ddc3 SHA512 10a750948157904c0812aaae85e21eaf5c85dfef3770d418fd0c592a9179cef9fc2082ecc125be0fd0032e705dfb678d45930d3aa2cd0986a71c2e0a7307722c
 DIST geometry2-0.5.16.tar.gz 154351 BLAKE2B e630be09da6de544de0215d40ffcb0aa780be253320264d52603d5fe7506d12b27e986acb9c036973ba390c5cd96b5e838849ee2f5b1399148cf5cffb461cd76 SHA512 11909db98af78bbdef8d1a7dc5f20d3ff3cfcb0afc0e1d53b97a1ffe99aecea911f09364593eb232d7514a4caa192141404d892a33fc7ea9f5ce924ecf99fc51
+DIST geometry2-0.5.17.tar.gz 156516 BLAKE2B 72f936086fe3dbcfa3c05f7ae72e64f20fd1525513e79ed9c4dae7c5b097501ea230c483a3f1eb6e0ba6a342e0ddc5deacf05ec9f0c97b56df48dcf2bf669e8b SHA512 44d91796f03d0cbd8a9247568827dca4a848ec931fa754fd7815e9102f7bcac38e85ebcc27e3037827358dbfbc7d58b28775f00e1e04c48125e56c7b97cde925
 EBUILD tf2_sensor_msgs-0.5.15.ebuild 669 BLAKE2B 421e0a9477b65e934283192c07b6e8f61fffceb9b563c6fb3da5b4206c1f9c5fbe3d48c277acf604166d014d212b1f3e04c721c692a2723d2112438c1278f325 SHA512 457c001966d6e995f0773f3c6faa15dce13f82f60de4adb4814c1cd624fb60e76cb0cd2c8fbde72dca2ae26fe6250c7c913cd9c26fd2c724df09589929de1db1
 EBUILD tf2_sensor_msgs-0.5.16.ebuild 669 BLAKE2B 421e0a9477b65e934283192c07b6e8f61fffceb9b563c6fb3da5b4206c1f9c5fbe3d48c277acf604166d014d212b1f3e04c721c692a2723d2112438c1278f325 SHA512 457c001966d6e995f0773f3c6faa15dce13f82f60de4adb4814c1cd624fb60e76cb0cd2c8fbde72dca2ae26fe6250c7c913cd9c26fd2c724df09589929de1db1
+EBUILD tf2_sensor_msgs-0.5.17.ebuild 669 BLAKE2B dcbbfed6d01622cb9180e5710c873c91b3c89f98b687ef997d6bde5b7a674d5ff28167690e058fb811f4c14abe98f0dae052e333bef7ad512f26da08b060f518 SHA512 5fd908cf73de8cac73082449f277cc8855eef78b3592ffd4f3ac103f2f441a71d4e625239781de015e7318ae44d9b47c4a72d28e2e70e21f18cec3ec17a31382
 EBUILD tf2_sensor_msgs-9999.ebuild 669 BLAKE2B 421e0a9477b65e934283192c07b6e8f61fffceb9b563c6fb3da5b4206c1f9c5fbe3d48c277acf604166d014d212b1f3e04c721c692a2723d2112438c1278f325 SHA512 457c001966d6e995f0773f3c6faa15dce13f82f60de4adb4814c1cd624fb60e76cb0cd2c8fbde72dca2ae26fe6250c7c913cd9c26fd2c724df09589929de1db1
 MISC metadata.xml 339 BLAKE2B bf7648aaefd8e1834d8d0faf1307566a068bffc3873942b6c799124486a369df38f2defae61afb67c51ed4750b77ee68ab163d1510b6ea0dedb3867bfa9a29e2 SHA512 70bde02b98edb10a9340db05de2bac26828bafd43be3fe2796a4cc8c115b409eac13c0eecd0ecb038f49f6eaa2bd6588671afff450fef02c0301356323216d51
diff --git a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.5.17.ebuild b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.5.17.ebuild
new file mode 100644
index 000000000000..b4c841429ce6
--- /dev/null
+++ b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.5.17.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Transform sensor_msgs with tf. Most notably, PointCloud2"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf2_ros[${PYTHON_USEDEP}]
+	dev-ros/tf2
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
+	dev-ros/cmake_modules"
diff --git a/dev-ros/tf2_tools/Manifest b/dev-ros/tf2_tools/Manifest
index 0b450c18c6b7..7efb5f58d62f 100644
--- a/dev-ros/tf2_tools/Manifest
+++ b/dev-ros/tf2_tools/Manifest
@@ -1,6 +1,7 @@
 DIST geometry2-0.5.14.tar.gz 147162 BLAKE2B 9034e37e099e601323ad7bd7ca167a93dd40143efe2e9d202f61cf2740f02f537f3880df87d41ec377e09f9d31914c164a8fe0f94f3cdea23a7d1c4bd98098d5 SHA512 1e32dbfbd46a2d72dcc53cf67914bdc6bd1907cf8d9b6c24c5b73e9738a7068b1b974ea434a267f907f276bf70b85f7169d85679449402e0808edadb9fe21e82
 DIST geometry2-0.5.15.tar.gz 147275 BLAKE2B 27a520d7c76eeea551d95092ede446f2badaee72b72ff24936a2116a0fa824d3f83afa7b07c5d962824e163a4d470490a0d68a8026e9bf829e87d1008b88ddc3 SHA512 10a750948157904c0812aaae85e21eaf5c85dfef3770d418fd0c592a9179cef9fc2082ecc125be0fd0032e705dfb678d45930d3aa2cd0986a71c2e0a7307722c
 DIST geometry2-0.5.16.tar.gz 154351 BLAKE2B e630be09da6de544de0215d40ffcb0aa780be253320264d52603d5fe7506d12b27e986acb9c036973ba390c5cd96b5e838849ee2f5b1399148cf5cffb461cd76 SHA512 11909db98af78bbdef8d1a7dc5f20d3ff3cfcb0afc0e1d53b97a1ffe99aecea911f09364593eb232d7514a4caa192141404d892a33fc7ea9f5ce924ecf99fc51
+DIST geometry2-0.5.17.tar.gz 156516 BLAKE2B 72f936086fe3dbcfa3c05f7ae72e64f20fd1525513e79ed9c4dae7c5b097501ea230c483a3f1eb6e0ba6a342e0ddc5deacf05ec9f0c97b56df48dcf2bf669e8b SHA512 44d91796f03d0cbd8a9247568827dca4a848ec931fa754fd7815e9102f7bcac38e85ebcc27e3037827358dbfbc7d58b28775f00e1e04c48125e56c7b97cde925
 DIST geometry_experimental-0.5.12.tar.gz 131234 BLAKE2B 1b4a32aec39ed5e53c6bd7b91a85e5667202c59d9e6b2854dab8ced87968cdce71aa2cf7e6e40d6d8b34ae30faf38263a9cec04111f03f17f66bf34563c4728d SHA512 1a1a33db529d0810661c020552642d914de01a14e5b17b611fb7743a795c47e3f68d480ee4544b4ad86f7b1c947ea8b23cda09535ce046fdc45da1c40fc34711
 DIST geometry_experimental-0.5.13.tar.gz 134107 BLAKE2B eeeca3cd764775e6fc2ab73147b033a1bcb39a57a72516690772f40e7fca2d26d85e66cbf3a37a0a56d8be3e7239c1996344a40b94a82e2591bbc141e94c8fe4 SHA512 5b31a2ec2c8f852934c1c9a6aa0127c96b8f334f178742111c673195562a240649ac11ddde8d9738defae99184bdd83a57430fe6f17eb4cbd08ae600bfa7d43d
 EBUILD tf2_tools-0.5.12.ebuild 577 BLAKE2B 93f1b1af3cab5dc9658eaa18fb90e4c16148c1bd300efc18183a61c20b61e06d7047704a83d61a91a8d94bf4bf0f9253f491c90059c360fc53e6eb6cbfedbb1e SHA512 c2a37d9fbe9869821dc7778d0d4e426de92eae00274faeec4047c50f5c0af0139f1db2dcbb28c95effa949a8c33b8479cfcb640de83b6161d42b576d7979fb2c
@@ -8,5 +9,6 @@ EBUILD tf2_tools-0.5.13.ebuild 577 BLAKE2B 93f1b1af3cab5dc9658eaa18fb90e4c16148c
 EBUILD tf2_tools-0.5.14.ebuild 565 BLAKE2B 482efd293cd0f0015eb101c805a46cda6a3287da182559908830884c0c662131e476a29998fcc293d20fcd98941d00bf2df0e6a1739adc9d0e32dd33438e5a0a SHA512 cd24e0ae858a0776c151232ced119477e3aff6b83a56793ff8a325f62fe5d71a3dc513ec5604886fb01ec6d2c2618302b48cedf3e40d5d946f5e7124659a6293
 EBUILD tf2_tools-0.5.15.ebuild 565 BLAKE2B 482efd293cd0f0015eb101c805a46cda6a3287da182559908830884c0c662131e476a29998fcc293d20fcd98941d00bf2df0e6a1739adc9d0e32dd33438e5a0a SHA512 cd24e0ae858a0776c151232ced119477e3aff6b83a56793ff8a325f62fe5d71a3dc513ec5604886fb01ec6d2c2618302b48cedf3e40d5d946f5e7124659a6293
 EBUILD tf2_tools-0.5.16.ebuild 565 BLAKE2B 482efd293cd0f0015eb101c805a46cda6a3287da182559908830884c0c662131e476a29998fcc293d20fcd98941d00bf2df0e6a1739adc9d0e32dd33438e5a0a SHA512 cd24e0ae858a0776c151232ced119477e3aff6b83a56793ff8a325f62fe5d71a3dc513ec5604886fb01ec6d2c2618302b48cedf3e40d5d946f5e7124659a6293
+EBUILD tf2_tools-0.5.17.ebuild 565 BLAKE2B 5a1b0e497f9e03eaf244710b9bb787579127f42a47432d31ff59ba0cb27553337424cb951d5231a70fc45b5a9a65866fb9ebbfc8d67acfb0b6915fed84bc71fd SHA512 9c05a0524162a3090376ea122bd96b48cd6e24bc747b4b30472943b25f8f2aa235b75504097b47584f8c1a0615a2fdbe193dda8071c35d1f54d4fd2d48866abb
 EBUILD tf2_tools-9999.ebuild 565 BLAKE2B 482efd293cd0f0015eb101c805a46cda6a3287da182559908830884c0c662131e476a29998fcc293d20fcd98941d00bf2df0e6a1739adc9d0e32dd33438e5a0a SHA512 cd24e0ae858a0776c151232ced119477e3aff6b83a56793ff8a325f62fe5d71a3dc513ec5604886fb01ec6d2c2618302b48cedf3e40d5d946f5e7124659a6293
 MISC metadata.xml 339 BLAKE2B bf7648aaefd8e1834d8d0faf1307566a068bffc3873942b6c799124486a369df38f2defae61afb67c51ed4750b77ee68ab163d1510b6ea0dedb3867bfa9a29e2 SHA512 70bde02b98edb10a9340db05de2bac26828bafd43be3fe2796a4cc8c115b409eac13c0eecd0ecb038f49f6eaa2bd6588671afff450fef02c0301356323216d51
diff --git a/dev-ros/tf2_tools/tf2_tools-0.5.17.ebuild b/dev-ros/tf2_tools/tf2_tools-0.5.17.ebuild
new file mode 100644
index 000000000000..007bd064fc2d
--- /dev/null
+++ b/dev-ros/tf2_tools/tf2_tools-0.5.17.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 tools"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/tf2_py[${PYTHON_USEDEP}]
+	dev-ros/tf2_ros[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/visualization_marker_tutorials/Manifest b/dev-ros/visualization_marker_tutorials/Manifest
index 18841e28074f..13eddc8c6edf 100644
--- a/dev-ros/visualization_marker_tutorials/Manifest
+++ b/dev-ros/visualization_marker_tutorials/Manifest
@@ -1,6 +1,8 @@
 DIST visualization_tutorials-0.10.1.tar.gz 428608 BLAKE2B abee44fa91388e792a5e2ccadf07a32236f7575f5a0e0121ddfdc0135bf63b12c8d603d4bee3ef463f0c64debf9e9c6f8c7c89c2e8dce8375d3264039b6378b0 SHA512 38ad2c29456ff994914b1ca3b2ab6d90b0c9224481d360fd7f88b38c0e9615d35eb94b90abb699738b5f4fac091489bdf2373168bc3a0acc0e6ba3a61b646bbf
+DIST visualization_tutorials-0.10.2.tar.gz 428684 BLAKE2B 751d18089c69cdb8cd0cfac97235d213cce9d098264dc49fcaf7d7a949216b8fd40041c23be5d16be1537298b876dc1854a8b7dc1214ba7aeb74b18716892636 SHA512 40d8621fd05e81dc23adbf7fd0a69209d796ade3ad291aa350030872a3bbffad2ec9ac0d31734ccf73f8215f7dd52834a35baaa3fe198a3fc4c5bda71a760b05
 DIST visualization_tutorials-0.9.2.tar.gz 428117 BLAKE2B f25320fa80b12a8a5499d505af369c33362e7f085de3846478b6376fc49e4e2502f07ded6c9e1025224d7b2418d78c87933b2d93b66ad2865eb45581384df24f SHA512 4a2b323e74725dbb77fbba6405d39246a89b170c66dec78288c4461d70c419efc3197eed5867f68305e490552d0480525153f98a64a3025efddc367db824ca53
 EBUILD visualization_marker_tutorials-0.10.1.ebuild 431 BLAKE2B 611791dde1d1bd5646770eb26f6e52ff904e6823ba9e26d49bff4cc154176faec86ab66bdfea219deda61e08ac56c28d67bc5fb602d101c2cffc4e5d340fdb94 SHA512 b4b03e71016ab6dc058dd36410c9865e53aacf0d45d128a97ae66a249d76958c541167c1fcb94ce56c0dc7ae912024433866a81e62b3aeb5cc7e25f545616573
+EBUILD visualization_marker_tutorials-0.10.2.ebuild 431 BLAKE2B c17e489055aeb591796d7bf9aa76cb55a1577729506cfcfa477edc60a796ef941befadea473c1c29561b8a781b5f8512d4ed78b02fc8efbcce896263de6748e5 SHA512 bdc3f9c5f14fc1d7656b530fd7c7c4c90aa7e4e0bc920cfaec28cb15829430337c8a0f27c683fbe05c4676f2981abe222b0abdd0a980059ca01ea3713f35ab0c
 EBUILD visualization_marker_tutorials-0.9.2.ebuild 431 BLAKE2B 611791dde1d1bd5646770eb26f6e52ff904e6823ba9e26d49bff4cc154176faec86ab66bdfea219deda61e08ac56c28d67bc5fb602d101c2cffc4e5d340fdb94 SHA512 b4b03e71016ab6dc058dd36410c9865e53aacf0d45d128a97ae66a249d76958c541167c1fcb94ce56c0dc7ae912024433866a81e62b3aeb5cc7e25f545616573
 EBUILD visualization_marker_tutorials-9999.ebuild 431 BLAKE2B 611791dde1d1bd5646770eb26f6e52ff904e6823ba9e26d49bff4cc154176faec86ab66bdfea219deda61e08ac56c28d67bc5fb602d101c2cffc4e5d340fdb94 SHA512 b4b03e71016ab6dc058dd36410c9865e53aacf0d45d128a97ae66a249d76958c541167c1fcb94ce56c0dc7ae912024433866a81e62b3aeb5cc7e25f545616573
 MISC metadata.xml 355 BLAKE2B fb6b9ee20af31ea0d99819722e6df9dc086b3b4de71d9a3aba80bee73490a62738ce308e9b1e77ee22c079e21ff7623b13fd7d46fd8d670232ea45a3cffd47ae SHA512 5e233967a9e4b9c0f790ddfa82d4c2febbb2948b3ed3abe4ec91d1ec0e80202738daed074eb911a63ccd6209837f5e52ab985ff4e792f3e90a38120963e8db34
diff --git a/dev-ros/visualization_marker_tutorials/visualization_marker_tutorials-0.10.2.ebuild b/dev-ros/visualization_marker_tutorials/visualization_marker_tutorials-0.10.2.ebuild
new file mode 100644
index 000000000000..264e1b66adae
--- /dev/null
+++ b/dev-ros/visualization_marker_tutorials/visualization_marker_tutorials-0.10.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Visualization marker tutorials"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 52b552865352..2a70fe8a643a 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/abstract/Manifest b/dev-ruby/abstract/Manifest
index baacdab74184..7b0725e90b4b 100644
--- a/dev-ruby/abstract/Manifest
+++ b/dev-ruby/abstract/Manifest
@@ -1,3 +1,3 @@
 DIST abstract-1.0.0.gem 12288 BLAKE2B c61fe73f5a5b765296e4a61acfa14b39468878a442a1ce8689e846089da9a3d6c8f5425a791040865d5aadd435ac78de6f48f809f081ca0883c71f733e4cbe5c SHA512 7c6fffc012baf704a27470fecf44dc97e6ca9f5bf9db47c20f23e59376af1262c4618ad70a70faa446339a79f94bbce04c2f5a6c506bd010c60a0fa5f60f346c
-EBUILD abstract-1.0.0-r3.ebuild 649 BLAKE2B 95f5c3a398fc937698aebfa666c056f7e8ffd87250ef66f8b4e344ab454b6158212b287bfafbb99de28695762aa49ca50ab6006c83671e01687c2c016b0bd9c4 SHA512 36f127bb8bc83862219ce631c4b96ec6cdbb65588f2e31022c85643f849990c92cc65768c0377d08b3c91eec302bec8b31ac0670291d092c3d6f0e2792188c8e
+EBUILD abstract-1.0.0-r3.ebuild 649 BLAKE2B 27448391c18989aea94befcb6eebd7e8a687e61ef290d3951ba184bed2447753feba916af3691b7cc4b16d9e067a920c7f9968f6a3b9d2ef5a29c60bf0bb3f89 SHA512 1df01c282d548c59ff04c6fca15a5f0b95a3de398a045634c51cee40e1ea41f73c17af4b919ad8fcf8fdd388fd7f3a3405f0746b522a0ec660ca14e6e66fd078
 MISC metadata.xml 326 BLAKE2B 9d949e43d77128e14b13f83c61b85efa1d766d2b09b33aa10957282273b233bb5f6785b570e08249e3acc3920e3c5327fc834e8973d252519ec0963efdc379f4 SHA512 af7919ed026803725ee33c836a16034b32eade1a09f18ad5f5a506454fcdbbd2cab3cfc0e21c494ad1380795439719f83acbae1c3cc45a3cec6b1e02cebba390
diff --git a/dev-ruby/abstract/abstract-1.0.0-r3.ebuild b/dev-ruby/abstract/abstract-1.0.0-r3.ebuild
index 854f264cc4aa..88524c72424e 100644
--- a/dev-ruby/abstract/abstract-1.0.0-r3.ebuild
+++ b/dev-ruby/abstract/abstract-1.0.0-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index bba62294a693..f96dfa4c740b 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -1,6 +1,7 @@
 DIST minitest-4.7.5.gem 57856 BLAKE2B d0ecb0a0693c35ebbda52e9c755b72f07e38d6ccc266312a3426f9de3c40165d68bf07d5ed162ce51e31b1bb8502dc844fe61d9e93733108501f156c3096af23 SHA512 7ea0a52d37f4631fb8b11d4389da2123e4207093f7b34c497fced8729c9086faaa35e997debdb53b694e05eb52b16e843960f0b54515c32207f87161a76c3851
 DIST minitest-5.10.2.gem 75264 BLAKE2B a8967591bc590e839d1186e787c5d925b67d8a12f5b49dbcf04f653f53945aadae9b2bf93a432e67c3f7eb2c99d25d9730ee4530d189c059eeee9e46f4bc6ac8 SHA512 f2a0ee13166cd6cb2cebc1f075347f205ac14e03943b2cccff7eadd34d09f2fb8ea0a6c764f20a84efef6463f4101a998110809c81c385225b4f72eb5da687d2
 DIST minitest-5.10.3.gem 76288 BLAKE2B 2c4fa5bca17e8a6270923225cd91fa9b6374d2a00b278906faf4e3ead0baf5fb1572a3c75322befc35ad0016d86f49c905e7de0283b07c60585c4c0348d69701 SHA512 6a3b1c86471fd7bb6ca078de9f253aeb9533f8da027998c34cd7fb8165a1d3bb565c1f8df958bb0eef6b7e22658894175c5f54f475585f2c05bb667e812b7aa3
+DIST minitest-5.11.1.gem 79360 BLAKE2B 97066b398d04a840327bbcc0cfdf71d7945450f979ff70824f9d455de05a0931d8d4d6cdfd4a0ccb65443fba4a4e6378d74277748f4f41beb6e552b1caa83792 SHA512 b25a7f3952f546fe2ab7a87f3fa6d1980e3642b25e7c7b6bfbd94cf2063458613f0a73e71e773323e0277b375827ffe629701d0a17fbb30c6bd00095eda447c0
 DIST minitest-5.3.3.gem 67072 BLAKE2B 58511cd3cf5e8cadc78427a4818f973aa59873cd35bf553874cfa3e785a6c3d427d3c8b7e5f5f915842ca2b4b2ce594f847873536b49b8860cbfb3812dd58908 SHA512 e1ea2cea5b61231b3074aea1dfb15b104a4e8a6b361d274194b6876401c29f839be618eb7c0448a42bc51ce57f0c2fcd84a72d1b0e0ba034ec5ffe6fbf2ae509
 DIST minitest-5.8.4.gem 72192 BLAKE2B 364cd5da716e33b9c4a6e0b1e249864445205a759b289f940379db033c25edda776177bb2435df75d30b51602193a1f039e72bf3515cfcc4cdbcc83e5a7815e6 SHA512 92569e41e334f209260ac77f9157f1dac8824111c6a810d954f7c66d24cf7a16d7d874186288580bf1f800889d8bdfc80437691d91208990878c295e14c1f906
 DIST minitest-5.9.1.gem 73216 BLAKE2B 553143159ddc688ee0961a1714aded658dea3b6d5823bfa1555e96d25506eed2a789ad0b31939da1947e3e1d21fa9b4a9f59f3b429354283baa8c28fcda1a444 SHA512 4b02ea62297ad5be8bbc8d541405b0d73668ec7fe0f78318fb85fcc35321d934285df13aac2f3e5c4f9cb303b2689bca36a13bf1f8359486f9c66d4ca2fc6e72
@@ -8,6 +9,7 @@ EBUILD minitest-4.7.5-r1.ebuild 755 BLAKE2B 8bbc1e959aaa032aa41c151bf19a29422942
 EBUILD minitest-4.7.5-r2.ebuild 951 BLAKE2B 378b2e1f8b34403503cac08066cf9b1bd17cabf18960356ac67986def2416f774f8a7f5f7b44ef7c2d9dc1c293fc5a2f6412e36c9ae507466dc4881dc8f04df1 SHA512 76b836e2e763bc224add765ece794d0c23f986c2b136fd3d762f5165134518a213f2f7477031be6f03e349bfaa329f38ad5e6700bb453f3ba3e5e95c1caf7a82
 EBUILD minitest-5.10.2.ebuild 806 BLAKE2B 38d0fe4a589a70a3002d54f7faf8d9252fc988746bb55b1d8ee2318770e77b8cd32bd3d9b298b1b4629181f58b84612d125f0b67d50bed37a3be77ed89756d10 SHA512 5c6c2c91f11eeafe874fb60b3c351ad304cfd81cbacec656aba32b27b549f9e5d21cfd486b6e2a90cfbf1c1cfab6cc8ab654fa82f3b0149328e6e72ccade4084
 EBUILD minitest-5.10.3.ebuild 806 BLAKE2B ba232bd0de4eecddba4e56dd4254a594e379f8cae03fa9f503665d898cc2ee395ea75dfd69ae45c41439bfee275b883e0160b71cba71702b8282384c2245ad36 SHA512 e61c3fc6f57eadaa35bd70dd8539f6445a66867d129ef960c77a6a4c996c57f81c861aa9b93afa447a9fd0c0446104d795bddbd4a18c95a73fcde552d9f9bbd9
+EBUILD minitest-5.11.1.ebuild 806 BLAKE2B 396d4f18c587cdfee04ba8092487f3e8f593bb994a4490827750e943f888b02a713ed34c0ee32488ceea6d77a682627032b3b1637d99bcab38a377881241ee8f SHA512 bbfa20031a7580e63616d78bbd2bbae0137b5478216e151f9d977aaf77ec797c74c3a3fcd318cd440849872665d16e89cd5112607691f0e92e38e7525a94d65e
 EBUILD minitest-5.3.3-r1.ebuild 817 BLAKE2B a2173c0cb66ae8fbce47f13b0afd04f78ffff56c246670462f7cee90a73b6f26435c4489f3dcc4a35bcacba892a752c8681341ad896425565890c21b2c162737 SHA512 b96a9b0b391626ec3579314fb4d5e4d2635a8b78bdc3acec904519c78c87b633e5ed015fed19f7bba04a47adb7d2808495354e7ae378847c88cd4fcff3d84c53
 EBUILD minitest-5.8.4.ebuild 796 BLAKE2B 6e7708f2fc1cd4bd22980dae3c7306945c18ad9c112390e3d3325d84a2387c7726e22f69de3137c338933831e1a0420675acfbde440555d5e46badf5886544bd SHA512 e2958bf4b1822b12a1d1f957f81f2b01be96ee60454ad0f523d2d8aed04c74d0366f5d7fdca03493c0958a1772d0c6fb9fb6e2a32d1ca8f4f424b626ce0514c8
 EBUILD minitest-5.9.1.ebuild 797 BLAKE2B 3b9cd0b577f21c21ec180ad7e48a3dc73b585ca319a396fcf4fd98131c4309a3eb38856c53792a4a1895c3355feac2414803be081fe5f122ef825f17e9a4b7fb SHA512 ee2593712316571c86e9c6f3564c449af05126b2a58db37c1827fa532e63beb2887563d70b6e38036541e4ba0a28130bdb016c2f99975d570ef966ac4740438c
diff --git a/dev-ruby/minitest/minitest-5.11.1.ebuild b/dev-ruby/minitest/minitest-5.11.1.ebuild
new file mode 100644
index 000000000000..b79c3ae574c7
--- /dev/null
+++ b/dev-ruby/minitest/minitest-5.11.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
+HOMEPAGE="https://github.com/seattlerb/minitest"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
+}
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index d4304c1d7080..5e45182ecc75 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -4,10 +4,12 @@ DIST rspec-core-3.5.3-git.tgz 368960 BLAKE2B ba4db57ac16dbd98960f7e5bad4ae7382af
 DIST rspec-core-3.5.4-git.tgz 369170 BLAKE2B c95fa7740bcc1b586b4e26be1db4cb52bb470cb23c9ef74dc644d0ea7c4ca769ab62e587ecff2a16cd6f656e9f3bbdc81b199765f9397dddbe28a8cdce6a1945 SHA512 c672381e9233b6f8c6e92ed70d084ff7a558edd6ca7d5a09a28fff1554975b952b6fab94483324b5bd6a62ff7aac576e7a216dbb3972749ef0210fe1cd05411d
 DIST rspec-core-3.6.0-git.tgz 375590 BLAKE2B e8b4987ea3d5cc3a403eaec98243e4c4be6c9eace798bc97599020543401ecd036c6121a6736995fb716aabd1a2016393506bee1e3076c61b0c49173d991d990 SHA512 cecd3885652e18ba1ffed45e40d12c932ba0d880e96b2f1d264709f55dbda8d6b0c78c3bf4bb940d246b84261d1b80038618735f65302ff62646165b2e932be1
 DIST rspec-core-3.7.0-git.tgz 376565 BLAKE2B 86b0584883047c83e4fddfd09924a5b68828f53e2018d2513cd79484a390d1b7b89e8176b0098b8869d5ed7206c132d77a0d8ef2ffb5447da317460b152e5e23 SHA512 071bd2a5c905d4ce621f2d7255b882a9d34cf42001cb2995fdb05a91387805929198c32e53cf4c2df2a43d179d2c49337214066be87eb50ab044b5f70aba8c54
+DIST rspec-core-3.7.1-git.tgz 376819 BLAKE2B 6747ffd8f2d426718376b51356d8838a7db0d0246ee619e8edef30bd9f7aeeb80bd0488e4fc73b0a00d119074c35055f6b9d0cbbe6160ae78d0727ce9848a710 SHA512 1561d044281c1b8b97cc89033ad991548fa74abbc5f20d3951d3f3de754c581a027f9ccb2bd0107c05e744d3b2804555cf4cf207e72adf365b28fc7ce052dab8
 EBUILD rspec-core-2.14.8-r4.ebuild 2764 BLAKE2B d8a6bda7260cf9657695ad47473edea4d49efb97dc8e591b7ae642b971c93d5df370a254e0831bd422cb80e10314e25169fc09ed82f601faa63fc5f11411a95c SHA512 3c53e284b1c11850a610dd956b31aa0e6cedaf7925d346c95198a1cd9cfdd3a2c23f9b14aef382d3b9c6551241b20980a2f563ce9f11264048daa649ded2e694
 EBUILD rspec-core-2.99.2-r2.ebuild 3049 BLAKE2B 1f226c2e6afc8a60409c1db0a9ec26cdda2573d5d6d2e6115cb04c7173e87ce3a0c75c91c331a3e3907aaa8c237a47e7fe11f1869c6d91f04e80a12d1ec0170b SHA512 7ece50dacf7e887c6a10ed2c143cdc05c41e5d70a6331dc1021dfc43acf97a73e93fd9b6393b0c923fa90f75f96d844fc493040bcdb4c3f77e3413f6c6eca23f
 EBUILD rspec-core-3.5.3.ebuild 3164 BLAKE2B 0eb341fc376171025a09bac586b90d4a1f16412bdb384df1d14b3dad7e4784ac4c456acb6dcc400fdeedcd1d9fbb2c6b098f60259bc179e8a9aae3cc4e36e2ae SHA512 fb8fc39c784cf66a63385d6e58abfe2e74833ea5594c0d01887e883003a67603dabea69a2c598bd38ab69a49938136c0462fa4a217363b1d4cd189a9e4946dbe
 EBUILD rspec-core-3.5.4.ebuild 3178 BLAKE2B 511992cfaa43a4fb51e907994c0edf0862d31f6f899c0cc04577d8fd31f48c450a1a82ebeabc5862d10e5a0793d266cabdffd94541ad3ff6016043029d07b1a6 SHA512 93b1179badab718a9ba151b489381a0892ab9975fbe405fcc99cf6b4725965d5aca29b25ec4bce93e2636a8d87ccdf427ad39ba468643f506d8aee4adea04b0f
 EBUILD rspec-core-3.6.0.ebuild 3253 BLAKE2B 26cf65b64b3f0f0d10c53ddf9a2e83b681eb2e6eea777fdf456239ab2cefed43908e10282410e8d775b199021a2806130f44ea55a83fb70cb4fdfdcc734b380d SHA512 776e4095374cfbcd0eb8d0595e5d270a2faf18c506f09dcc9fa531b894e9fcb81b028771a912fee2d4dc2745b6d65cb8e887a2a5d9109edc1cc2fd64e21e1392
 EBUILD rspec-core-3.7.0.ebuild 3239 BLAKE2B f894a7c9e1e777bef0bc6386ed876aca414642f2b2802b44fd86d145c2c5ad86701d402ba2c22a664ed796f9e4a04c8aa2b51b8bfe94d78202f0635b15bc9c79 SHA512 ba0dcccd775215fe8e61ea0b054636c62499c206f3bddd5302f771808f0dc386c270a2b821f6a1ad5ba9a2f6a3a4a6205c47227e35ef8798a569a35a7c171271
+EBUILD rspec-core-3.7.1.ebuild 3239 BLAKE2B 6bff8f24b4b05a283d867b8be0fe09676992d1f7fd7941d259abf4d2c9d0d17877a51eb14dac34490a749930fc2a43df7aa47e5d554024a5bc8725da88536b37 SHA512 d9641ae04b63dcc6de577e66aab1d9663402048697f033e4b967e3ca3350794b30a58d5fa9a30233a08117ccabd2b3ba714a91941e95110a89216bfb12aa5c9b
 MISC metadata.xml 465 BLAKE2B 7aa4aea8fcc4616588f8842e4d3625219eabe0c17f7a621f9d01ba3ba403ce178ba5960a15c9a163eea32a9956cdc27ce1a607bdae1c32a1a6fa1207c7358388 SHA512 987f6c0ce5814c23f3d76a32f0b59ebd89ddc71bcb23d109106a2ee11a5ab050cafd1ec7f87c84f07b4b4d71244d71885c6d727d2b583484c0e5f6466066a57b
diff --git a/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild
new file mode 100644
index 000000000000..0be2590a5fc4
--- /dev/null
+++ b/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_TASK_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+# Also install this custom path since internal paths depend on it.
+RUBY_FAKEGEM_EXTRAINSTALL="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-core"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="highlight"
+
+SUBVERSION="$(get_version_component_range 1-2)"
+
+ruby_add_rdepend "
+	=dev-ruby/rspec-support-${SUBVERSION}*
+	!!<dev-ruby/rspec-core-2.14.8-r4
+	highlight? ( >=dev-ruby/coderay-1.0.9 )
+"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/coderay-1.0.9
+		dev-ruby/syntax
+		>=dev-ruby/thread_order-1.1.0
+		>=dev-ruby/rspec-expectations-3.3.0:3
+		>=dev-ruby/rspec-mocks-2.99.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Avoid dependency on cucumber since we can't run the features anyway.
+	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
+
+	# Duplicate exe also in bin. We can't change it since internal stuff
+	# also depends on this and fixing that is going to be fragile. This
+	# way we can at least install proper bin scripts.
+	cp -R exe bin || die
+
+	# Avoid unneeded dependency on git.
+	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
+
+	# Avoid aruba dependency so that we don't end up in dependency hell.
+	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
+	rm -f spec/support/aruba_support.rb || die
+	rm -f spec/integration/{failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
+	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
+
+	# Avoid a spec failing due to path issues
+	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
+		spec/rspec/core/configuration_spec.rb || die
+
+	# Work around coderay incompatibilities
+	sed -i -e '/be_highlighted/,/end/ s/32/33/' \
+		-e '/highlights core RSpec keyword-like methods/,/^      end/ s:^:#:' \
+		spec/rspec/core/formatters/syntax_highlighter_spec.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
+
+	# case ${RUBY} in
+	# 	*ruby22)
+	# 		# The rubygems version bundled with ruby 2.2 causes warnings.
+	# 		sed -i -e '/a library that issues no warnings when loaded/,/^  end/ s:^:#:' spec/rspec/core_spec.rb || die
+	# 		;;
+	# esac
+}
+
+all_ruby_compile() {
+	if use doc ; then
+		yardoc || die
+	fi
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
+}
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 3e2b55a92d2e..43ec7ad3523f 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/guile-lib/Manifest b/dev-scheme/guile-lib/Manifest
index b977d1ad5a00..8512cb1aa1d6 100644
--- a/dev-scheme/guile-lib/Manifest
+++ b/dev-scheme/guile-lib/Manifest
@@ -1,5 +1,7 @@
 DIST guile-lib-0.1.9.tar.gz 499394 BLAKE2B 1a8fcd30d78250c454c709f5dbceaee9a8e3e7bfdef0fc81ccb65370758d4263050179fa8b203c7e823d6978e46e15648286bbef6a73c28b30296187b46af85f SHA512 53a00064783c6cdc450f3130808ca57696fdcd1aa25172b448f6d18861425e1dfa9a004df0405df0629950e80c43b4aebbef28be1e75a37f0d9cd4608ecc309e
 DIST guile-lib-0.2.4.tar.gz 421960 BLAKE2B b1ce073d6deb1236209653dc65ec6667e33dd670493b11328ab5f6b260e8332673ff9856e4212952b4be4986c656169a830d403aca239bef145c6fe50f3b5d30 SHA512 d5744f7f99bf566c569fdb06bf51b8f74543930cbe120c392d111b06ac930afa15008af44765331db0542affc07afb3016b60dc35be612b99f79264cd07b8f5e
+DIST guile-lib-0.2.5.1.tar.gz 424124 BLAKE2B 36aaf66f6a1550e24101547203865fb73f60ebe04d04e13a8244d81cd91510288f00f7c77636b86fd4a5c49f6157e187d623eb26d4ad361e7a284d9dd2f017f0 SHA512 500f0a5c973af1594402a4d564be8a6e559f575e10de35368cbda2d24d73c9b781b06b4a61433cf2609f91a7548903dc01718d70796e48a49c6d50988227946a
 EBUILD guile-lib-0.1.9.ebuild 571 BLAKE2B 3cc28cc2e41daf45f9c97e1cb577ba04536f85c6bc5a8cfde62e743c55d1fe8a52c6f8abb8ae0323401e68da7f979407e3cd9bba27fe1320cdcf0e14eb7c2437 SHA512 5e8a86a54f9e5ad3ea1cffc74ea901d1a9481181f9915e23fa539c7e6d6a5957a69ea82ce84b10d5a663df18279623750704aa89902f6aa8501b1f04ccd07fbf
-EBUILD guile-lib-0.2.4.ebuild 561 BLAKE2B 53f76b9544c76d0c36c98f226d83b02113469a80e441711f73e1e178ee46f82dd81b28d1f275751273ef2efe6c0e1f312513b1b62c77549a8be88ca3a5664970 SHA512 889cffe6fbea8ed7f2c9f2c1186db7a5443fac91586793213c57c0de720d28a634d74b901d307442efc75d7b773536eef5a85256a52fd00781922a6102715fd2
+EBUILD guile-lib-0.2.4.ebuild 584 BLAKE2B 3f325c7f82b195bbb0f56a9de22accd58c639cdaaa6b9abbdfcf0e5a85b238f05cf17a0ce9bc2cb87efa8d5d31d55b3e72dd022953fd974f898fcae439d72bd0 SHA512 fe217f67edf6fe6c7e9442d65a3a310d3ac3ad9aff5fec5e23882248342c7ce7c25aa4be09e5a29da650bb6e9ba9295f61215dddd30b8ca9088f4323736c798e
+EBUILD guile-lib-0.2.5.1.ebuild 580 BLAKE2B 254f5352e868758573b1efd2c32a7398dcc7c2cc3b6722a6edf8ad17e6e6b4cde96bfd43f7de36a40c3e34edb2a2f38c873c58419efcb84aa1769f08a07bbecf SHA512 e30f3ec2541caf6701382f91a0d95398e10b6ed879cd06a8e097fd1ea830b20d967bd8ff1eac992520b303e4cb1df7658309b931cf310bb3a0b129c92d517762
 MISC metadata.xml 255 BLAKE2B e964916ff43a4807177c33fdb84eee27b3683571dfc9038e69bb1e2d99a996d8db529a4d894b88c1d9cb8771e0bfa15be4f8411320be05254be0185241649b07 SHA512 39d166e37ab93cad3ab7852f67a51422f3e2c3b23c79227ce1379e833455ac750cd69cba663a693fec0fca564434d56decaef0d03eace2ed9ce871805b537eed
diff --git a/dev-scheme/guile-lib/guile-lib-0.2.4.ebuild b/dev-scheme/guile-lib/guile-lib-0.2.4.ebuild
index c6796a8d2cab..157a36687c8a 100644
--- a/dev-scheme/guile-lib/guile-lib-0.2.4.ebuild
+++ b/dev-scheme/guile-lib/guile-lib-0.2.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="An accumulation place for pure-scheme Guile modules"
 HOMEPAGE="http://www.nongnu.org/guile-lib/"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/old/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -15,6 +15,8 @@ IUSE=""
 RDEPEND=">=dev-scheme/guile-2.0.12[regex,deprecated]"
 DEPEND="${RDEPEND} !<dev-libs/g-wrap-1.9.8"
 
+STRIP_MASK="*.go"
+
 src_install() {
 	emake -j1 DESTDIR="${D}" install
 }
diff --git a/dev-scheme/guile-lib/guile-lib-0.2.5.1.ebuild b/dev-scheme/guile-lib/guile-lib-0.2.5.1.ebuild
new file mode 100644
index 000000000000..f9324102b8d7
--- /dev/null
+++ b/dev-scheme/guile-lib/guile-lib-0.2.5.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="An accumulation place for pure-scheme Guile modules"
+HOMEPAGE="http://www.nongnu.org/guile-lib/"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-scheme/guile-2.0.12[regex,deprecated]"
+DEPEND="${RDEPEND} !<dev-libs/g-wrap-1.9.8"
+
+STRIP_MASK="*.go"
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+}
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 4f26c97c94b8..d42c8d22023a 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/cpp2latex/Manifest b/dev-tex/cpp2latex/Manifest
index 8ed10ac0efb5..678bf0310636 100644
--- a/dev-tex/cpp2latex/Manifest
+++ b/dev-tex/cpp2latex/Manifest
@@ -2,6 +2,5 @@ AUX cpp2latex-2.3-gcc43.patch 345 BLAKE2B 6bc47b4b7086a17ee874e91db150eb22d89298
 AUX cpp2latex-2.3-tests.patch 443 BLAKE2B e4dc503430f18664079612ba7a62ec049bbda5783cfd2b28592967a570451b987f448aece713b49a5667fee2cb4af274dfa9093e4c196352f51ec7fcc5acbdfe SHA512 21da2eeb1616993c82dddef8f4214c1e68b40cea40d8497a8a24e1151ef5680c72de3a2660a34bcc1e02d832558643e1a46a20675ed2a50f71500f7d346cec1c
 AUX cpp2latex-2.3.patch 1261 BLAKE2B 958c861f1b722161f61407885c19408c38f0b48f9316c1c2dd76edd7d1e1dfb43cbde13ca4d92e9295c2dd448a56e18552aa2b825beab33686a7a567fb5dcf00 SHA512 8effdd739ebee882c4449ab40020086a977087be449948729c194d8a14e6d2b053c061a2ca3291229c34a8cfebf930118392a288224fad8fcd36dda2d0402c08
 DIST cpp2latex-2.3.tar.gz 483213 BLAKE2B eed33201db3a2144d59d200386e44976f6c7e7b621516c23ac35c195f7fa64d65cd156ef6a4d610dffaab62ca62cc73ab1894cc8bf94284e61375be44ad6ad06 SHA512 af4a13a79b2eb14556f35ca372a0c4f5fec5ddc52a712e998fb73dfe0451c1d95eb857f905a9fd66fac72f734fdcad50b9bca2769780950c7b04fa56912812e1
-EBUILD cpp2latex-2.3-r1.ebuild 761 BLAKE2B 59bd910e18338d587aab8346b10ea2e8e378f44abc514c657a38c9adc29b5f46caa5eaf12ad513f57de05efc059846ecf08cd8787bd66f7971df0665af9d9975 SHA512 feff129f5c2e4dd94458f66ecf8e7ce82eef48a08c80c14c43563d3b335ee9c1e0ed6ddedb973d80ff7a0129926cb8d4312ccecffd6e1cab0b341222b38b91a2
 EBUILD cpp2latex-2.3-r2.ebuild 498 BLAKE2B 33ccb32d168f727a910df7409d42ead5e275c37c21edc83d3e0ec074fcc0b6e7e7037c8ea69f6ab4c99d61482fcf8c7a9735afd3d807dca8e398b3211294c2f6 SHA512 fc7e14f89b016e5ea14e0523fbbdb7f436d205083155ac06d3d56c680159c4232b3412d58d109423fa0f59bfde8f931e7fc8704e7fc3fdca1478e2a4ed1103a4
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/cpp2latex/cpp2latex-2.3-r1.ebuild b/dev-tex/cpp2latex/cpp2latex-2.3-r1.ebuild
deleted file mode 100644
index 719cee656d0f..000000000000
--- a/dev-tex/cpp2latex/cpp2latex-2.3-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils
-
-DESCRIPTION="A program to convert C++ code to LaTeX source"
-HOMEPAGE="http://www.arnoldarts.de/drupal/?q=Cpp2LaTeX"
-SRC_URI="http://www.arnoldarts.de/drupal/files/downloads/cpp2latex/${P}.tar.gz"
-LICENSE="GPL-2"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-
-# although it makes sense to have tex installed, it is
-# neither a compile or runtime dependency
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}/cpp2latex"
-	# bug 44585
-	epatch "${FILESDIR}/cpp2latex-2.3.patch"
-	# bug #227863
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-	epatch "${FILESDIR}/${P}-tests.patch"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-}
diff --git a/dev-tex/pstplus/Manifest b/dev-tex/pstplus/Manifest
index 15585f8e9497..3c5b3c8a119f 100644
--- a/dev-tex/pstplus/Manifest
+++ b/dev-tex/pstplus/Manifest
@@ -1,3 +1,3 @@
 DIST pstplus-1.6.tar.bz2 434500 BLAKE2B d9dfa91e4fbe9b546257860bc44e171c30397683da7fc5e0e5d0d2ee2dec5e545908555e2d1b5951ef0321fbe17009ca222526b0b341e8296778f4454a1b2cb9 SHA512 5abb97f240db3244350e77c404ef4ebcb65f6baa00d6975e161d7fb03132631c9b09ac9dbf56cd3e6f418bfedb69746fee91f980b6ad55a6f6ab16c5ec0e5e69
-EBUILD pstplus-1.6.ebuild 794 BLAKE2B 2a13741ee22d41062826144b9d6ce4fd7db746506f68b83e05fd07481560ec648c79292e6351a76ea40d962e306941b82b6400e9728e5a9409bda6f906439643 SHA512 799226e61a0bc1f4ac68f72e9ca77ea4b265c6eeabc905e90d59719378822d8bbe9816831b7186f9500ea71170e0c15bfc0c600e5cc042db5a01ccd8237e5098
+EBUILD pstplus-1.6.ebuild 802 BLAKE2B 82c7d022d8ab4bd6fa19f5fa5c9367849fe93c848b5c92280d20b33df008434851bd1777af6b0ec27e49119d42c14617004c0e05ab452f35b465c8e996a034ab SHA512 adfa5ba61b018f64cf0ee095a5bfe555c1e71106bdc5a5c5534e45b26dcbb87229ac61afcf0113631cd93d1662cbf7b2e0c63120e303db62aa82d3d8ff028330
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/pstplus/pstplus-1.6.ebuild b/dev-tex/pstplus/pstplus-1.6.ebuild
index 58920c84824c..50f3fcbd4a14 100644
--- a/dev-tex/pstplus/pstplus-1.6.ebuild
+++ b/dev-tex/pstplus/pstplus-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -15,7 +15,7 @@ IUSE=""
 
 DEPEND="dev-qt/qtgui:4
 	dev-qt/qtcore:4
-	app-text/poppler[qt4]"
+	<app-text/poppler-0.62.0[qt4]"
 RDEPEND="${DEPEND}
 	virtual/latex-base
 	dev-texlive/texlive-pstricks
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a7fe135d6d09..9214631dd9b5 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ignition-cmake/Manifest b/dev-util/ignition-cmake/Manifest
new file mode 100644
index 000000000000..bfdf9370eab1
--- /dev/null
+++ b/dev-util/ignition-cmake/Manifest
@@ -0,0 +1,3 @@
+DIST ignition-cmake-0.2.0.tar.bz2 69508 BLAKE2B df51c53f2e09af260cc4ce245400f821ed29c83791a088cc3e059caf5e08f073f0d297bdc66947f77e81742c6c2a8f15a177cc082b2fb20c5f12daf59d3cf851 SHA512 fa9ada51a6cb88a1bdba5ee5732402abeb63e8f6dc044b73c9b0ccb180492f570ddf4a6f9ef891aef6be83b4fcce50ac509c724f5b8a3c99d5a30fc8d0433ca0
+EBUILD ignition-cmake-0.2.0.ebuild 439 BLAKE2B 3ad5cb7e810c2f44a170e152eadb91ccbdd4d8e83cd680ee08967fd2331376fc3321da60a8b03f1937fb062d3ce036f55ba22e1cd2f3cab435be5e55bc5157c2 SHA512 d6b9aea2003fdf8e45c9a19ed75346fea237d004e341f0e010a7d5e8c542722170c8bb8e54e168ec1c56240c0ab429b0a669a6dea83fea8695b31636c5ac6d5d
+MISC metadata.xml 343 BLAKE2B 536ab78631c87736b53a743176498918523743a53aba4ef92acda61a623962309d0a76618158ec211cc33c6cfbc0ce02bc8342539bc5696fe04d5654db87ce84 SHA512 82518150642d903e8f9b18e1b175bc4a694a90d02877e4d5af83b0a8bdbba1ce2063ca27a6e6161211df3c82588d9f2c28b7aa0e0e84326c1ea63242bc34e739
diff --git a/dev-util/ignition-cmake/ignition-cmake-0.2.0.ebuild b/dev-util/ignition-cmake/ignition-cmake-0.2.0.ebuild
new file mode 100644
index 000000000000..0f9105de8c1a
--- /dev/null
+++ b/dev-util/ignition-cmake/ignition-cmake-0.2.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="CMake modules to be used by the Ignition projects."
+HOMEPAGE="https://bitbucket.org/ignitionrobotics/ign-cmake"
+SRC_URI="https://osrf-distributions.s3.amazonaws.com/ign-cmake/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-util/ignition-cmake/metadata.xml b/dev-util/ignition-cmake/metadata.xml
new file mode 100644
index 000000000000..78befc813835
--- /dev/null
+++ b/dev-util/ignition-cmake/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>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="bitbucket">ignitionrobotics/ign-cmake</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index 7ff8ec429662..71cc3733e3d1 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,4 +1,4 @@
 DIST xfce4-dev-tools-4.12.0.tar.bz2 309586 BLAKE2B 8ebcc8f133772eb39acba0b2f189a67751b9a2b4d36e5897003d56f6b88d3e97e89e0383b98c4b5ae684786d5aed3409a4b491fdbaa6e37bf8fc7447a33b8605 SHA512 60f90daaaac3eea355779ee1bb6a0cf24fb9e0ba70971c9c26ea681755de41560cfbca59a28241c2fd818031dc46e95c550424577451ceb7a42b1de0b0ff4a31
-EBUILD xfce4-dev-tools-4.12.0-r1.ebuild 631 BLAKE2B aca5802e4a4bade0788153608a7a62048bde09617ad3bfa132ade09c4a5066c2caa1da533b6ab427f088ee562c90f92a723c26e8c7d5eb81048010a4269a3212 SHA512 9dfefb286b73c80faec1e9c7c9ff00f642f810ebb891798fa799318fec6f7d6a3e3c0fbb45c89d83a9c6e0b93d3bcf3c6234b028fbe4808959dd873e30004bd1
+EBUILD xfce4-dev-tools-4.12.0-r1.ebuild 630 BLAKE2B 92174f049161affb70bcec1cad126a31f7da45340eacbd1df9a75271a1117a9be21d4d78308535eabc0560957fbc33b9abab952ef075da2c2c4bb860d3ff70c0 SHA512 6203bf47f1cca7a227730e50af4da1a8120143ca36766f56e63e5d8addfb2e046df03f3574bf391c2219f69c10a8b6efdb72b4f5814eaf8f5112b8254c196e4b
 EBUILD xfce4-dev-tools-4.12.0.ebuild 656 BLAKE2B 8ac6d5792b533095405de797a2965b03a3cea149f780e65e9db7b6238854f1c2bb36fad06b74bfa0c2a0994ce93ed1cc0f17e6f3ba0c6eaee1264879b43fe85b SHA512 7eedf87afd0397dc9632458762b3471ebbbfd2453d5d2903584f79f05912999631629ea1d221aed8883705e05eeb6beff4dfe99aa38e0c515a9f0944b1b93382
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0-r1.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0-r1.ebuild
index a3f554ecae8f..5888205ae529 100644
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0-r1.ebuild
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.30"
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index dd0de6bb7087..4f0dfba9230e 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/qct/Manifest b/dev-vcs/qct/Manifest
deleted file mode 100644
index 665af7255f9f..000000000000
--- a/dev-vcs/qct/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX qct.rc 25 BLAKE2B 4d07cb40dfcb70f3e8ae227cf18105851bb38344d6a8eca844938e1241130724d8a8422797ef5f4c7bc8ebe3fceffe9c27105a18b1283993b4fc2cac4620299a SHA512 61bda2332e9a9400ecbcd134a65b3a286291690afed67b91ac6773d16b23e6c3ea1615601b6a1bf79bed76b681455941ae2260167d3844c197db83bafa1a8e09
-DIST qct-1.7.tar.gz 56658 BLAKE2B 68f7c4632b4fb04154800d5677b70eb722b6f635c9f742d114fec0f3a2c8673a7a7f24fbf15b833264af7c664a321d76b2c1ec551f2502f84c1a2707c0920009 SHA512 85f8b6bcd5c4081ba17da1bc7e17d0036ec10d9133ed5383adbca16f81b8550d6f137e34636c20f3d03b7cedca75467daa057022374866b4e2ab18aaf7d4b6d2
-EBUILD qct-1.7-r2.ebuild 1575 BLAKE2B 4a681add867f8925262f545bef1da448da5d68a74ef3d2012f0ad2ef8aa25ffa0c4f323974b570dad1aa3791563a7a744e36662796c4db12b0661f6ba3420020 SHA512 0e71028620a7aef2e13514f9b24c3b5376bf019bf845a5d0c07e1400a0d854bccb10f2e7b8d8b194a6d3436cc69ba55dc5923d3f937a8dbb8acc80824187e891
-MISC metadata.xml 597 BLAKE2B 95444eec9ef2e823c43c0a35de80e817c4c1dc427b2b1c3e095ee313a694242299d6628d475f7db8290b8a829c42c7eba0307a6f70544aa0d5114e58b78101d9 SHA512 a56e77e545176d386731a8ce14936505a62208d58a4210d50a01379181fc24a6b853e5f698ef6a4824038f475668cba7b83184cbe0cc13acd0fcbb4668fe42f3
diff --git a/dev-vcs/qct/files/qct.rc b/dev-vcs/qct/files/qct.rc
deleted file mode 100644
index 3ab69befa3c5..000000000000
--- a/dev-vcs/qct/files/qct.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-[extensions]
-hgext.qct=
-
diff --git a/dev-vcs/qct/metadata.xml b/dev-vcs/qct/metadata.xml
deleted file mode 100644
index d821bbf0b013..000000000000
--- a/dev-vcs/qct/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>qt@gentoo.org</email>
-    <name>Gentoo Qt Project</name>
-  </maintainer>
-  <use>
-    <flag name="bazaar">
-      Support for <pkg>dev-vcs/bzr</pkg>
-    </flag>
-    <flag name="mercurial">
-      Support for <pkg>dev-vcs/mercurial</pkg>
-    </flag>
-    <flag name="monotone">
-      Support for <pkg>dev-vcs/monotone</pkg>
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">qct</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-vcs/qct/qct-1.7-r2.ebuild b/dev-vcs/qct/qct-1.7-r2.ebuild
deleted file mode 100644
index 0093c1bb1ff4..000000000000
--- a/dev-vcs/qct/qct-1.7-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="PyQt based commit tool for many VCSs"
-HOMEPAGE="http://qct.sourceforge.net/"
-SRC_URI="http://qct.sourceforge.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bazaar cvs mercurial monotone subversion"
-
-DEPEND="
-	app-text/asciidoc
-	app-text/xmlto
-	dev-python/PyQt4[${PYTHON_USEDEP}]
-	bazaar? ( dev-vcs/bzr[${PYTHON_USEDEP}] )
-	cvs? ( dev-vcs/cvs )
-	mercurial? ( dev-vcs/mercurial[${PYTHON_USEDEP}] )
-	monotone? ( dev-vcs/monotone )
-	subversion? ( dev-vcs/subversion[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-python_prepare_all() {
-	# support for git requires cogito which isn't in portage
-	rm qctlib/vcs/{p4,git,cg}.py || die
-
-	declare -A delfiles=([bazaar]=bzr [cvs]=cvs [mercurial]=hg [monotone]=mtn [subversion]=svn)
-	local i
-	for i in "${!delfiles[@]}"; do
-		if ! use $i; then
-			rm qctlib/vcs/${delfiles[$i]}.py || die
-		fi
-	done
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# manpage and html docs are built using asciidoc
-	emake -C doc man html
-	HTML_DOCS=( doc/qct.1.html )
-}
-
-python_install_all() {
-	doman doc/qct.1
-
-	if use bazaar; then
-		python_moduleinto bzrlib/plugins
-		python_domodule plugins/qctBzrPlugin.py
-	fi
-
-	if use mercurial; then
-		python_moduleinto hgext
-		python_domodule hgext/qct.py
-
-		insinto /etc/mercurial/hgrc.d
-		doins "${FILESDIR}/qct.rc"
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 290300b6c693..f7988a8d37dd 100644
--- a/games-server/Manifest.gz
+++ b/games-server/Manifest.gz
diff --git a/games-server/nwn-ded/Manifest b/games-server/nwn-ded/Manifest
index 9e67007fd558..fc835790f181 100644
--- a/games-server/nwn-ded/Manifest
+++ b/games-server/nwn-ded/Manifest
@@ -1,4 +1,4 @@
 DIST NWNDedicatedServer1.69.zip 606293816 BLAKE2B f5e9f49bcaf76329310eee092328ef6cfc7d825409d66369ec18a8b2f881a6f6232a0a63d89d23f755165c1e13e6140575549875b55e80a0002f85b7af2b98ee SHA512 0f91ab8d03d040389d9ad7ccc7d50079057d62d542fecfb2164a726511718ba982f7b2f9878bc1143f2c61b3ef7ab8f92e5e4007b515ad6aff51216c5b602ffd
 DIST NWNEnglish1.69dialog.zip 3200987 BLAKE2B 8d0864ce22b39862a72291afca3e4ea8ff7ae35cee0dd38cb1424d7f767aeb4df82e4a6c53a1d59c2e670e3af05c8e6ff1984e6f1065d7e71f70ead97d0a369e SHA512 8c3214a3bcf137ea3b4b59d89055b7e22d15b8ab8d6007d81a9e70e156f8af611a8032ce5cf5c42ecd8c5af7eebe95f012a3f91723f273efa42701fd036482be
-EBUILD nwn-ded-1.69-r1.ebuild 1793 BLAKE2B cfc784f97a11caf9a223e60fe50613a977b7d938e9a76f19683d81c548d37c50683aa634aa68b59ccc51d5558258af80c411450a896fbfcdb6a8fccfe028e526 SHA512 cda6c5af5053ec20e5c21455a0d8062e348eb76f0883975928ba505a5392e138334d21c0a82fb077b26aeeb6b570c51bc5fae58e01760dffefc4243063467d33
+EBUILD nwn-ded-1.69-r1.ebuild 1787 BLAKE2B cddcef0e76a4d35888cacc73e12ab2e20e1715752e8aaec3d792bde67c3543e73ca50fbb69e0290885383e079a52e5dd918388486541f77e64d05ab33929e915 SHA512 fffe02b765fef007cd04230fb6d6c218c351a904b8f332cc7522fcc5990a9f049ab13278df7cfaea4db2632a87bb3d618a5730bf5da39997069111b3e21245fc
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-server/nwn-ded/nwn-ded-1.69-r1.ebuild b/games-server/nwn-ded/nwn-ded-1.69-r1.ebuild
index 57623fe2cfb8..21ee32df32f6 100644
--- a/games-server/nwn-ded/nwn-ded-1.69-r1.ebuild
+++ b/games-server/nwn-ded/nwn-ded-1.69-r1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit eutils
 
-LANGUAGES="linguas_en"
+LANGUAGES="l10n_en"
 DIALOG_URL_BASE=http://files.bioware.com/neverwinternights/dialog/
 
 DESCRIPTION="Neverwinter Nights Dedicated server"
 HOMEPAGE="http://nwn.bioware.com/downloads/standaloneserver.html"
 SRC_URI="http://files.bioware.com/neverwinternights/updates/windows/server/NWNDedicatedServer${PV}.zip
-	linguas_en? ( ${DIALOG_URL_BASE}/english/NWNEnglish${PV}dialog.zip )"
+	l10n_en? ( ${DIALOG_URL_BASE}/english/NWNEnglish${PV}dialog.zip )"
 
 LICENSE="NWN-EULA"
 SLOT="0"
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 26412a2a3d90..bf491ce81712 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/ja2-stracciatella/Manifest b/games-strategy/ja2-stracciatella/Manifest
index b6d2c3dda703..c5c81c574245 100644
--- a/games-strategy/ja2-stracciatella/Manifest
+++ b/games-strategy/ja2-stracciatella/Manifest
@@ -3,5 +3,5 @@ AUX ja2-stracciatella-0.12.1_p7072-gcc6.patch 526 BLAKE2B 22567919e68d467447befb
 AUX ja2-stracciatella-0.12.1_p7072-makefile.patch 3666 BLAKE2B 11c110649dce7650a315511edbff12036ad2a257d7d4c3d4da5a14a7d3ae0e9949fc2c8b5f435789a3090cf2a200f4b1d9e2175a1fa94466eaa6e1c209bfcee7 SHA512 07cd2f1367bd9dbad9bc6ec3d633fc77bf337dddf69d69da7c297722c1684c9c80e88b918b89dc2e02e83160b224cf7b22f6e21fce2de525ee480a513c64cd99
 DIST editor.slf.gz 134265 BLAKE2B 0a379a2340ad717b2be913eb7368a73232a231e7cf2753f2569bfe3027f51e5e4b8aac8cb15982b6d46161529054c3f15ae11849faae42ed34c8d4dbb4aa52c3 SHA512 243e3bf5e7298c3a71b330985f5c4d4df3e4cb43df32c823d835353d6309a64f62679c3d0634ca162f6484f7cbf366627e57b1d967188c13940db8933a5f03f2
 DIST ja2-stracciatella-0.12.1_p7072.tar.xz 2118832 BLAKE2B 229cd30891216ba305f8b81764b57edf4179bb09a783d2619242c6e3cbeb29f131cb1901934364d952b54796c8398985a54cbf465d36f737c438958c145dcdb1 SHA512 9269c9e2e179d705b6d83dfac56c604eaefbe5bffe5c16e3f26c1209d3842bbac22db19362e51acf0c6602d64a283d2ec4fa19b0f37d1cddfb013f686c936411
-EBUILD ja2-stracciatella-0.12.1_p7072.ebuild 2152 BLAKE2B 628faff355ae0bfe245a4ea394d4b8e47f8e6613466f1790f87e88131f1d7202bb18b0a4daa84c4403b080740907a3c11a430e30068595a971869ca7b2e5966a SHA512 887483bd24b802974b96751b82225053b25d09d41ad0c324a104dbe8c71067f6812b442ec7865dbcf4d5e1d1688f106476136d7db5b8e590c76c8d21eba7f854
-MISC metadata.xml 410 BLAKE2B 915f199a4ed9d17015d6bc0cd57004492d13baaa452204e7276df8f8bed90a05617c600aba5e4c438c7e6eb95445bb7a73a663b8e606196e014a528f3aca89fe SHA512 0f201d58a748d5805f72631ce3b012769074ec54bbaf4165db510ad9be8aefed57cea5910b0144b90aacef3e44c3f77a6855eadb71880af6a657794e9911a2f7
+EBUILD ja2-stracciatella-0.12.1_p7072.ebuild 2109 BLAKE2B 184b1753465260dcdd0d175f0b9b6c1af01ff3486111cd4f6fb2f1d08ec000a231feee8ca62c65f66f0fed2e67e9e8eab6892d78c753d046d5ea19bb597cbfd2 SHA512 3974587fbc679732a92cab1b7418fb90f4cbf9d7aa8f0e8c28c4bfae106379bc13c8184fa0680c604af3af1dfd83c8af9b630416c3267c61da0de1013f756d11
+MISC metadata.xml 402 BLAKE2B 4329f4f00399517a6c54e94930d5ecaebd78d2321fb479f3de4faf42783ea8c3e081fca8b16e129d6351fc6e2d5e47b17273198ea1da851578dfa59091900736 SHA512 7f56ace0297b3af4c5d4f386428d9341bb7ca462370abf4c8b4814fce550b724f40f97d876b350ab8b1dd8f0c6916e20ca90a32de07d400739bfa40e004d1dbf
diff --git a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild
index ee606b9cafda..4da66d2c406f 100644
--- a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild
+++ b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,14 +12,14 @@ SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz
 LICENSE="SFI-SCLA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cdinstall editor zlib"
+IUSE="cdinstall editor ru-gold zlib"
 
 DEPEND="media-libs/libsdl[X,sound,video]
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}
 	cdinstall? ( games-strategy/ja2-stracciatella-data )"
 
-LANGS="linguas_de +linguas_en linguas_fr linguas_it linguas_nl linguas_pl linguas_ru linguas_ru_gold"
+LANGS="l10n_de +l10n_en l10n_fr l10n_it l10n_nl l10n_pl l10n_ru"
 IUSE="$IUSE $LANGS"
 REQUIRED_USE="^^ ( ${LANGS//+/} )"
 
@@ -39,14 +39,13 @@ src_prepare() {
 src_compile() {
 	local myconf
 
-	case ${LINGUAS} in
+	case ${L10N} in
 		de) myconf="LNG=GERMAN" ;;
 		nl) myconf="LNG=DUTCH" ;;
 		fr) myconf="LNG=FRENCH" ;;
 		it) myconf="LNG=ITALIAN" ;;
 		pl) myconf="LNG=POLISH" ;;
-		ru) myconf="LNG=RUSSIAN" ;;
-		ru_gold) myconf="LNG=RUSSIAN_GOLD" ;;
+		ru) myconf="LNG=$(usex ru-gold RUSSIAN_GOLD RUSSIAN)" ;;
 		en) myconf="LNG=ENGLISH" ;;
 		*) die "wat" ;;
 	esac
diff --git a/games-strategy/ja2-stracciatella/metadata.xml b/games-strategy/ja2-stracciatella/metadata.xml
index dd85b7c30ed4..3db7ad1de988 100644
--- a/games-strategy/ja2-stracciatella/metadata.xml
+++ b/games-strategy/ja2-stracciatella/metadata.xml
@@ -7,6 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="editor">Adds necessary file to run the editor</flag>
-		<flag name="linguas_ru_gold">Support for russian gold ja2 version</flag>
+		<flag name="ru-gold">Support for russian gold ja2 version</flag>
 	</use>
 </pkgmetadata>
diff --git a/gnustep-apps/Manifest.gz b/gnustep-apps/Manifest.gz
index 27200c638d56..e57763d136ef 100644
--- a/gnustep-apps/Manifest.gz
+++ b/gnustep-apps/Manifest.gz
diff --git a/gnustep-apps/cenon/Manifest b/gnustep-apps/cenon/Manifest
index 4983844a2a65..6c359a4dacb7 100644
--- a/gnustep-apps/cenon/Manifest
+++ b/gnustep-apps/cenon/Manifest
@@ -1,6 +1,6 @@
 AUX cenon-4.0.2-check-return-value.patch 1416 BLAKE2B fa71100d4dc75119f3b853ad246ce81a9703d26fd1a90ed8a40cf34d1c472f15a94c5328e333b616d820aef9bbf7d6426b612ef1b92c118eeda90595bedbf372 SHA512 07cd48ed24fc791a5b3921cae99b4bcd9a36167b1d4c376881b82f420c7870ea2ae02aaf1cade56bc88b3f306154e60d3e64a9c2b6fe880ead317250e0ada921
 AUX cenon-4.0.2-gnustep-gui-0.24-support.patch 7456 BLAKE2B 87be676970631e905cef75c1d4f7fa4b49449c24987d561851a888e0e510d18ed645047baf8b50db42ef045fc49f2de34a7c6878b2598eca5b5ad67a14b38439 SHA512 a740fda5548284d4d6ad46d972c19b23382b6d0e4b92573c9edebe1eb362f13863bc9e8b50fcfd0c9f450fea979ba781ce3723fe692f862ed23fc0e7f02b23b7
 AUX cenon-4.0.2-install.patch 690 BLAKE2B 64eff078e98b8d4052af2801517c0712384222007eb3af343f92793a42d4f4b5fdcc347b70b8832062471b73a13eb32d811de7a26b18e0b70005d4cc57b3de1c SHA512 fece9ed365b6fa5ca2b897b64c073eb780c6270f6e7f8c7e92748c54626cda3a47872245869f4e3ba8b8fbd9ee8bf8665b0feb1574daca006f828d363e95ad21
-DIST Cenon-4.0.2.tar.bz2 4143462 BLAKE2B 86f64a398148c95fc3d292c942a6f54de2e550e770d88fbc2c4c405c80ddc30c6a98d6bf314aed273b46f6d3d7c108c7711cbfab2cecdbf7864b4da3be0a2cb8 SHA512 202532242eedaf936a35e5df176cf613afe22880f1341e6e9b054fdae9d9aa158acf67bc6927cbbe70cc6215be378e08e318c66ff6a28122676c3ca5b9950d72
-EBUILD cenon-4.0.2-r1.ebuild 697 BLAKE2B f346ebacc623446981ee47f978b0491f1c69a47ec9d3b7b808a0fa037391f614d07093e63a37d7b9fb26e739a25445c788bf001d2bb85bbe0e7672541cc9d4dc SHA512 749ddd176de16f6a09065e4c5a74732d298b7201a45188ce0cb7183dcf1423beaf16faba36d63cc79f150e946974ec93759d2242cf0c5e715cacb3e6a9cdcac5
+DIST Cenon-4.0.2.tar.bz2 4150615 BLAKE2B 75252c6495c0cdba32f18e31674ff1c4f8e3d6c7f94b56ac763bcd7d8bcb401fe6817e0a06642dc927ff87c32956e9277a777a7744a8a33135a4e3a76aa511cc SHA512 94bf95dbdb8fbe9c21fbe80cbc33fbe376c598cf79be295cb1045a0ac888da5363f388f3f051d593ca47f6c1fcbade2825389aec5da328c59158a1e5da89db75
+EBUILD cenon-4.0.2-r1.ebuild 677 BLAKE2B 6ceb3cd274d1c4f3f24713fbf6fc26a7527bd89cf905eacd3ae8b215cc6aeb040b804386ef5a11b5801007f1c3a39b717e4a2c53ddd04d2bd28a222052c82716 SHA512 f52dfb053603ecfee1a702e9e6ed28d3247401ebcc68aae84af489c9d3878bb8040a7113bbc50fe90fa8ffc1e9de190e5b9e7819aac56fe8fee434e500b36ee9
 MISC metadata.xml 447 BLAKE2B cb51c659c741f694f0e13e16113d92e3211b52105bdaa29754c0f3ed040dd6d37bb1873b438d779a6f26080a23a25659a349405c28e4a05f0949c8472ed8d300 SHA512 8b1bf24888d06c487d4601bd31d5184070554ecd59923a3de482b4fcce6f5130c706f68d4b35d1545be4a1fbbd76ac36f3072df1c6f5e92c03d8ee3d566b72a3
diff --git a/gnustep-apps/cenon/cenon-4.0.2-r1.ebuild b/gnustep-apps/cenon/cenon-4.0.2-r1.ebuild
index b8df58c5f64f..209586efc0a7 100644
--- a/gnustep-apps/cenon/cenon-4.0.2-r1.ebuild
+++ b/gnustep-apps/cenon/cenon-4.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ S=${WORKDIR}/${PN/c/C}
 
 DESCRIPTION="Cenon is a vector graphics tool for GNUstep, OpenStep and MacOSX"
 HOMEPAGE="http://www.cenon.info/"
-SRC_URI="http://www.vhf-group.com/vhf-interservice/download/source/${P/c/C}.tar.bz2"
+SRC_URI="http://www.cenon.zone/download/source/${P/c/C}.tar.bz2"
 KEYWORDS="amd64 ppc x86"
 SLOT="0"
 LICENSE="Cenon"
diff --git a/gnustep-libs/Manifest.gz b/gnustep-libs/Manifest.gz
index 68920f9e5d44..b2795ac1ad72 100644
--- a/gnustep-libs/Manifest.gz
+++ b/gnustep-libs/Manifest.gz
diff --git a/gnustep-libs/cenonlibrary/Manifest b/gnustep-libs/cenonlibrary/Manifest
index df6ac529c87d..d429d42247d3 100644
--- a/gnustep-libs/cenonlibrary/Manifest
+++ b/gnustep-libs/cenonlibrary/Manifest
@@ -1,3 +1,3 @@
 DIST CenonLibrary-4.0.0-1.tar.bz2 2131692 BLAKE2B 2f00e3c5b743e239b116493e23f4bd6acee34b0f88d02ed791b4cec8487a24b28b442cecd3483773f8339eb93bcc0b1065edc0d2a15179d1caa83ad218700e5b SHA512 75d1acc2635cb5daee3311d2c54a43abf9d0de7b29997fec86effc4dd3932fe73449c08cda642d1f92adcea9da74cd4732014bb04f7418c1f331701bafe44427
-EBUILD cenonlibrary-4.0.0.ebuild 555 BLAKE2B d97d05435a10ac3a4941bbf313b4306f3ac967e1075b62d5f563d2c0a2ca50c77619476a7f26fa5723520a2ab6809a157bb1108e8ef534566bd5bd01bc000338 SHA512 552ece286723512825c3a8874c05b413eb90aa0e528b71c28e3b51f223f99190383fd8a5f3c2f9c62ab583842d1a0726fdb1f4358607ff71da8c497e2e8be21a
+EBUILD cenonlibrary-4.0.0.ebuild 535 BLAKE2B 156dd723a037f4031b19ab02e2fc15baa927acfe4dd61dc45e2656e7734ad8ade94205c013dd1301b30e90cb9c36d56bc171ab00f5928c401a8460ef9aa37c1f SHA512 a30ef96cf04e290f25af5a85ca96c0b10f9a10cb730a34ffbe390447c1bfcdf74fa370622eef4d52ced6bc006b12d1690b4373ca0fed1d5da241eab546ee40cc
 MISC metadata.xml 514 BLAKE2B 279e28730fdba3e0a619038a0ee87724083dfe4ec052ca387aa869b3f0a7fab76be6d7731ebd864cc3f3c21d594e13536125559196d9b0978fc1c61bf6a79b28 SHA512 06125a3d405f811589e4312606ab281719b8856d52bdcaeb78b414e20236b1f3e916d738c3df8d676f2853f53ea44f1226f14472b8b055630fc649cb8f5aa51d
diff --git a/gnustep-libs/cenonlibrary/cenonlibrary-4.0.0.ebuild b/gnustep-libs/cenonlibrary/cenonlibrary-4.0.0.ebuild
index 22579b020d9a..ef8bf528a2b6 100644
--- a/gnustep-libs/cenonlibrary/cenonlibrary-4.0.0.ebuild
+++ b/gnustep-libs/cenonlibrary/cenonlibrary-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ S=${WORKDIR}/Cenon
 
 DESCRIPTION="Default library required to run Cenon"
 HOMEPAGE="http://www.cenon.info/"
-SRC_URI="http://www.vhf-group.com/vhf-interservice/download/source/CenonLibrary-${PV}-1.tar.bz2"
+SRC_URI="http://www.cenon.zone/download/source/CenonLibrary-${PV}-1.tar.bz2"
 KEYWORDS="amd64 ppc x86"
 SLOT="0"
 LICENSE="Cenon"
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 4210f0d8f5ed..8cf8949366d1 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/latte-dock/Manifest b/kde-misc/latte-dock/Manifest
index e1b3b7311843..da57fa2f8a3c 100644
--- a/kde-misc/latte-dock/Manifest
+++ b/kde-misc/latte-dock/Manifest
@@ -1,5 +1,5 @@
-DIST latte-dock-0.7.1.tar.gz 1788443 BLAKE2B 55a597bf5a53d345c05296fa501f000d4216cc48924cdf7e41590e8c40e5167947d115a2919fb8ee54975cc9c2d4220a2abd7992eee4113b2eb8c24cad8add83 SHA512 8bf0acbb913bab7bfa0f9d75ab121dce6c6f86cc5f8f79ea0279f226a9cde4a1f67589c82a78336deeb140008687a3fce252ea5f85d69d3636b75e18180cae00
 DIST latte-dock-0.7.2.tar.xz 889256 BLAKE2B 34eed5bd375e9ecb7cc6007605e4e29b72bc755db774a997855eb2627a702834b5c08c627f7022f0d3b25946c82163f936433b4e6a02ca596097188fa1113eb8 SHA512 a332bede2438c5af6ac1ebb4fffe6954a0aa319438ce503d739f4878a28e54bf98dfcb64ef96ab9250cabe6e22b5c16e8308f61699642103e7085a0fedecdb05
-EBUILD latte-dock-0.7.1.ebuild 1644 BLAKE2B 3787228ff4360dbb38f73f5149583d7c2766317f30c93689b6091b44e7241a56f244e5c52daf6ecbb005e4d5552d4afe8298015bbe0031184de7b793dd82e42b SHA512 0b4a3da3cd5a9f9cae6db58ab7887f84e56af452a71ecd392589b39127d88b5031d2f330b3aa893320868f9b251af870a3fe4194ed16558d3705e98faf047c42
+DIST latte-dock-0.7.3.tar.xz 896272 BLAKE2B 1ee8e4a6406c6fa9cfc3db41f5362fd749a2d743974e878a5baa00a837f731235e4e6b2a0ee39e814c091412fbbcaa6213331a74b8884f63998d7e26543a5eb2 SHA512 a955a304d83dc90723ff4c501816a799866a300bed17adc0f44354d30039c270bfbb3d2d70e316c88dd86527aff9fb5b07dab00e16c222e601f88c2937935589
 EBUILD latte-dock-0.7.2.ebuild 1519 BLAKE2B 0f7608c8067ca3aa731de51ce1401a8d9aa914f5affcb372397fd21b74cb2d79cae19d89ef0e9f1a317f5e2ecefa7cdfc50fe3a516c3e67f3962c9ca8dbd05c2 SHA512 c1d5ceea0c16ae26db0ac87dff84bf3467c43f2b7a206c8a608b6fe97ce79867b164813ea04f59cdefaeb3960a1a6f0d6a722d0d9f5a4968cd2e2a769513a130
+EBUILD latte-dock-0.7.3.ebuild 1533 BLAKE2B 9467d386051e61a0bae3eaa79d35d7c1b80daffed55fa9d0d8d3995852dd99a43b400f829cd876e04fec87373fabf4ebb4bfb4535a8a1d0c864e5b3c50389014 SHA512 f3d39486e27ad9d067cd475b3a8c940fe6b2649f971d64c7d633d5675720eec05e0ab2eadcf8cf02998d46b9b85524d99331a3530ffa939417001f23719acbe4
 MISC metadata.xml 453 BLAKE2B a49e759f4ce30c2730a4bf082b8f953e0e93f95f2de3b567798d4bea8229558ed72cd774c5d9b1356bd066dc92400d17f05d830746d87386c8c2921fcc484c80 SHA512 5fd22fbf848fbbc76422a4002e5efdddb8a387c406fc45b580e1ec93c36cd2407582770d5d842367fa0d7dd7fceaec196cf0202f56bd5144f89b4f573c2d9c35
diff --git a/kde-misc/latte-dock/latte-dock-0.7.1.ebuild b/kde-misc/latte-dock/latte-dock-0.7.3.ebuild
index 5dcfa44e5bcf..99117ea14477 100644
--- a/kde-misc/latte-dock/latte-dock-0.7.1.ebuild
+++ b/kde-misc/latte-dock/latte-dock-0.7.3.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-QT_MINIMAL="5.7.1"
 inherit cmake-utils gnome2-utils kde5-functions
 
 DESCRIPTION="Elegant dock, based on KDE Frameworks"
@@ -12,11 +11,10 @@ HOMEPAGE="https://store.kde.org/p/1169519/
 
 if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/psifidotos/Latte-Dock.git"
+	EGIT_REPO_URI="https://anongit.kde.org/${PN}.git"
 else
-	SRC_URI="https://github.com/psifidotos/Latte-Dock/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/Latte-Dock-${PV}"
 fi
 
 LICENSE="GPL-2+"
@@ -34,6 +32,7 @@ RDEPEND="
 	$(add_frameworks_dep kglobalaccel)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep knewstuff)
 	$(add_frameworks_dep knotifications)
 	$(add_frameworks_dep kpackage)
 	$(add_frameworks_dep kwayland)
@@ -57,10 +56,6 @@ DEPEND="${RDEPEND}
 
 DOCS=( CHANGELOG.md README.md TRANSLATORS )
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	gnome2_icon_cache_update
 }
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 79fcd15daa3f..9550ec4cadf7 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 93f4c43028be..be54b384a903 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -6,9 +6,9 @@ DIST mutt-1.9.2.tar.gz 4195627 BLAKE2B 626ddd2535e28d46a50ea8e862573c2956587b9b8
 DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 BLAKE2B ecc845983dc00e388c25ced0ca0c253d9fdfa813e9df6a4f166f4ccbb05cc26b5522fa84ccdfd1f92d5cce7291ac3d70ddefaeac3e13dafc892f924236a62f11 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e
 DIST mutt-gentoo-1.9.1-patches-r2.tar.xz 112976 BLAKE2B 3b4e882992982cf513bdfb27f24a136230e70e2e654136175394db5b6c2c37a48d1d4ae52da05a7b64c741eadd1c294f2141a36007516e6d444e3c5d2d949bdd SHA512 39204b0336bdcc610cf6152f2a41e1a4bde9a5cb05e2120b9ac80360ce978ba830656d53fb4c860ac35baf0ad7f9f359e151a2ae6a657de3073c97667b02c264
 DIST mutt-gentoo-1.9.2-patches-r0.tar.xz 112224 BLAKE2B 7c5a5e67029e8c2775a1aeb876c5ee87c5616d748b08457364da07eccde5d3baecb328a95ef2fae7755be72b08d553d4beea08ccc751e146ce46694eac0c1f73 SHA512 b2ba382c21fe8d31059dd58760bba1ecd0b8fd256b3ade3d4dc0ea3dfa8c94e6ae9ec7baaf4b7c1c6c29d819fc78e9e781f07964478796e882903c0e9e438342
-DIST mutt-gentoo-1.9.2-patches-r1.tar.xz 113324 BLAKE2B a5ae4ca22001e91de8450086928bc7e3b26a26745d74f2969fb15e1f020037f8caffb92e0990dd9c8d13161afaa99c6cca593f8322f2870e413220447de20b3a SHA512 250323bb7b697ece97846f078f18ae93560f5ea5a8e1cedbc6d30ee21f3b430722e794d7a751ee4f9e673777ff39868c9c1e9dca4d4787b54240df7d981dbb39
+DIST mutt-gentoo-1.9.2-patches-r2.tar.xz 117216 BLAKE2B d0d562f4118fe88341fdf6d8b5fe25ce66e96568a951448e3b0c8a6016e1a2af6c38800661dd2a5adf727dfd66a051dac1c11d834077c2111ec49ffd24af8db0 SHA512 08a92e3a75277520e1e308081d95912e339d1f52cdf668a7fda77203a33e363f5f479533f68812366245d20b6be3333e7433fe6cb2c29438709b10ffd5640b41
 EBUILD mutt-1.7.2.ebuild 7597 BLAKE2B 293f44f17fcac1ef39c1a02adeafa4096b57ebf62d4000ce64f2dce89c241cd87f83f7dd96e42b0ce245e5f1e1eae016025187d785c08ec5e2639494b820709e SHA512 4316b6c10d5b70071cc8e0d2185d89056763210bacf626d11c8632ce93e8638cdef2c59d87806b588551db590d8c0bcaebf6b487bb2eaa5c6556d57b51aeb2ef
 EBUILD mutt-1.9.1-r4.ebuild 8631 BLAKE2B 920eacb18c3ac7daece5133a2eb1b7cf6a7a187204bc0eb9996361e8763d39653f4636de258de484c20d6b3060681f598b30cad8e9d4c1d66a9cd0f8d6ce065c SHA512 a73465c57c30ac6373e58d0e9328b8ea1d073d2a5a62227afbcf5757a6904dda54681085e30cc8cbbdaca3a236938dd5aba4b3e90fd09d7b94df7e8cfc09abcb
-EBUILD mutt-1.9.2-r1.ebuild 8879 BLAKE2B 7034bcae3d694ed97dd4e2aca51d282fae04f456a9f7981fd6d035254497948edd394d61e16a77bcd509f3e1105ebe23d536ec5a8d3accd85248d7d61d4401e5 SHA512 602cb6d831da4dc80bb01933fbd6e804f2fe596c7d568b05fb2acdcf1069e2eb7ea17481e6dfa87072036b52d3427b4c03ef147797b7e1d707509f9404b2e56f
+EBUILD mutt-1.9.2-r2.ebuild 8879 BLAKE2B 8b327d901df419c561e10bedfd7fd23240dfef6425c464c2f760389e53989d45a1e719b57846c9fc431f62098495a4a81c59b391adc2f7c3a72bccaf7e7df8b1 SHA512 f67d4126c67f120d5d0fcb54fd0cb60a3e930ae5dbdbee8f4401d5c0ce1ba00a8e725c1610b2c8b1257a423bd681aadeb2b3b16ab321620e08424c585838e5e0
 EBUILD mutt-1.9.2.ebuild 8879 BLAKE2B 36c89d417e549315efb7d78426cd5913759d02f2597e120f74d28d2e002138da8214137f523a12ed3f17714a996254b6d158282bd96a2e68dfbfd34521bd59ee SHA512 e2652de977daa9a9efb3e6632acfb8705f79c6a30fb77d0c159f97d68da84882ab9884b252194d8c4b91b6e05075f4b7a9b93acc2261a38314abd1a78710b5b7
 MISC metadata.xml 1866 BLAKE2B 4ce87ce0025fdf35622e7029d1200e0e4ad0cc66dd8bb40e1830d2fbcbc2d2de6e22c46ef86579c50224e17df42efcb349a1df55bb836eb5649110440aba17bc SHA512 1c494d1b5a628417d19d836473da2ba99e1d0f1e6f5a453f03ef84f9c601d2f31f53edf03bd242abfa8cb2a7f84de9385014828b607c1fbd6de38acdba228b82
diff --git a/mail-client/mutt/mutt-1.9.2-r1.ebuild b/mail-client/mutt/mutt-1.9.2-r2.ebuild
index de6cc1806929..3d0dfb39c63c 100644
--- a/mail-client/mutt/mutt-1.9.2-r1.ebuild
+++ b/mail-client/mutt/mutt-1.9.2-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 inherit eutils flag-o-matic autotools
 
-PATCHREV="r1"
+PATCHREV="r2"
 PATCHSET="gentoo-${PVR}/${PATCHREV}"
 
 DESCRIPTION="A small but very powerful text-based mail client"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 72016903a4a2..1e44401b1ad7 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/dcraw/Manifest b/media-gfx/dcraw/Manifest
index 32c444d19e83..ae777cd467e4 100644
--- a/media-gfx/dcraw/Manifest
+++ b/media-gfx/dcraw/Manifest
@@ -3,5 +3,5 @@ AUX dcwrap 437 BLAKE2B ec88784e059ab07990acf3a47517f243502a140b451040c77f9320bd7
 DIST dcraw-9.27.0.tar.gz 191803 BLAKE2B 85f2954ebe7d9ba5c30f1ad971c53f87b4b10094084837a361f1975bb78ca07edb8a535ef524374b8644434d43fc515523c08c2336dd460d543756a1819caf5f SHA512 2b2faed3f1889ef82a50721f7d3f22b081104b586d644d369fa849ad08604c10898e9dfccf8935828cf432db74352161fe6d1f9bde5fbfa4dd8435188767a17a
 DIST parse-1.73.tar.bz2 8186 BLAKE2B 4d7d69bbaad3fd69caeae24e4dfc77fa580d969f903c925f76cf0a7bdb13ff34c96ab6dc9917609ce886365f6971290b3af63aec9fed43b1876aa44dd951521d SHA512 06ffaf72695dc86bfc2bdd10d4f732bc428b72d427f4c10e93fc58536513477cf297adb56fb9cfc5ba5fd5b6b4cd197c33d8dac957a0a1bbe65b23393b64278c
 DIST rawphoto-1.32.tar.bz2 3841 BLAKE2B db7a80af4b06fc3709a9ae69d9f166c3323097821bb561af4e0ac9a1ef677cab6cfd5cd7896d1e1fce85e6fab545ced7d00ce809f97332bec594b94a27f77e23 SHA512 6ee5b6c4e4266c8e04221c894c4e737f8a6d2c6f0cc9c82db73064afd68488bd60de19b86b2d7b82780283bbb9f8156ef3149c1c730f09a00dce632744b44d56
-EBUILD dcraw-9.27.0.ebuild 2955 BLAKE2B 4d4ad56175fde84333870a2aed574f1c342f5f4b77ff92eccfdcc467ebf4ece6ebbc5dbafbcd30254e095e4eae321854ce6ca4a4a36c57ddfe0106a52d29f9f0 SHA512 ec2dd6741539760db1a1748037874d85b815b05edbe586e4bbc28c5c42e0e5ee1f00d09d60fe5cec027686d56549ba3df97ce5b03b8ebf0e76500e52bb6be960
+EBUILD dcraw-9.27.0.ebuild 2961 BLAKE2B 7b8e95853e118b6262bb7996745c6ce375c6e7f56b6d5b957073966c3558b85a2ccf276dcff83b45df8232791b95ba41a2e3b946d25e0931215cf89d97532ace SHA512 30abf4256100ead2e7ca525cf365fb18e5d46afa6fe3bc0012f272ed3bc715349602d05a8b26d44c401138517848fa2a1796094efaff9df8244fd715d9a5f5c2
 MISC metadata.xml 701 BLAKE2B ad6e3ac7425a35fb16cfde74a0d540ab47676008f1de56cdf3ca101e3724e3c8147cf76f548f22a38862b09c67f34411f44718359e6467bdf8b94b9d041cf82a SHA512 0758eece42b5007b53e04f0ddb6385fbdea360afc8a4cfd94d3f5234e4a677819cbebdca3a78c7f3765770e6ccb5b2d74f20199b7c167137fd15554cc14d0755
diff --git a/media-gfx/dcraw/dcraw-9.27.0.ebuild b/media-gfx/dcraw/dcraw-9.27.0.ebuild
index 75b8edc043dd..7ff23c20d06b 100644
--- a/media-gfx/dcraw/dcraw-9.27.0.ebuild
+++ b/media-gfx/dcraw/dcraw-9.27.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 LANGS=" ca cs de da eo es fr hu it nl pl pt ru sv zh_CN zh_TW"
-IUSE="nls gimp jpeg jpeg2k lcms ${LANGS// / linguas_}"
+IUSE="nls gimp jpeg jpeg2k lcms"
 
 COMMON_DEPEND="
 	jpeg? ( virtual/jpeg:0 )
@@ -76,7 +76,8 @@ src_compile() {
 
 	if use nls; then
 		for lang in ${LANGS}; do
-			use linguas_${lang} && run_build msgfmt -c -o dcraw_${lang}.mo dcraw_${lang}.po
+			has ${lang} ${LINGUAS-${lang}} \
+				&& run_build msgfmt -c -o dcraw_${lang}.mo dcraw_${lang}.po
 		done
 	fi
 }
@@ -96,7 +97,7 @@ src_install() {
 
 	if use nls; then
 		for lang in ${LANGS}; do
-			if use linguas_${lang}; then
+			if has ${lang} ${LINGUAS-${lang}}; then
 				[[ -f dcraw.${lang}.1 ]] && doman dcraw.${lang}.1
 				insinto /usr/share/locale/${lang}/LC_MESSAGES
 				newins dcraw_${lang}.mo dcraw.mo || die "failed to install dcraw_${lang}.mo"
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 11b948c73938..41130462057d 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,8 +1,10 @@
 AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0b4b0c8f596ca9d2c2f516961f5baab9fd54ba870df75434d2ed59fd9034bb7e2ce38c00faef9c12a79c7ec4da2d5e416d7117 SHA512 473d2ed9070329512cbc26929267b25fb8d7726e21ed01d2921d4d8ac13b8ffaf166f07229fa7409192cfa14fabb0cf68b299bb3331b3cc953ae5363274fd15c
 AUX graphviz-2.34.0-dot-pangocairo-link.patch 882 BLAKE2B 633760e2049f035eeb1b79aedc040da71ca9707acd1ccdba7531c894a1909ebb9e8483319871f2db5e6d4e0ff275449ce682badfa33de232177474111203a62d SHA512 8e40b35d8d1ec6a9e683e4f4f39fd5e6c253015727172ba0ed1cf6d9a3b4cc20e3d4169a11bbed29c3cf3dc8ff6d14508ea6459dd62e53e7d69b62ee39ef9f26
 AUX graphviz-2.38.0-ghostscript-9.18.patch 753 BLAKE2B f9469184e815ddb153ba01a7c9ed759468b72c4394d1c96a0ef5f668bd9e8657ae09e54200149bb033845138eaa2587dc783f1e61c2496ccd926cc2aa6bc81aa SHA512 19327b3fbfecdad1990fd4d9668c3f318da5907c1a8c7e3abd1f1f5a0703c474975b7f08425eb2c0f5c32522ebea614d02b4db9e83cce7fb975458fb87cafc62
+AUX graphviz-2.40.1-qt5.patch 4140 BLAKE2B d0d92dddd6ae1efb7e24e22ac0f32025b16ad1aab5182ec410dfd527732fefdf335cda392f1036409ac3a6b86be15794b80546ff9cbfd47454bd01266d861945 SHA512 bd1d51ae10d17ef321bba7dfa619054642debbb02ea1458b0597e6c62471e7750bf5d2cfc68ccb6fd2964b0fbe072b2e7642dd8b097c7e046f8877a2e36d3f44
 DIST graphviz-2.38.0.tar.gz 25848858 BLAKE2B 2c35e7bde3824d7b99008d7879c08ee15bbf4c31272bfccc2be18e6ebf81622030fd856a6d48f7c62a03c8807c181593918f2841d8c0fd393e3b1c868dce81bd SHA512 0e51a97dae595f4e80bc9e4a12ba3c48485fab19941a28d522f5a0624b6a767e0ba720e9e55bff8efe8308dd1cd3793e2c99cb5fdfceb2d5cafb0cbee907e531
 DIST graphviz-2.40.1.tar.gz 25633455 BLAKE2B 96ba5a8cb94d93cf4ecd424bf29c1bf67099e39e582be97fca088de0aad6bbbb46b00af55c197894e0b63f1a96177894b6cd23498295bb524fe19a75661cbc59 SHA512 a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5
 EBUILD graphviz-2.38.0-r1.ebuild 7875 BLAKE2B c6db8f9f8fe5ad4f824e5d4a7f2fe97bed36a955ef63988969ba04e1ffa062845610a8a38c1d841ca5218750f3cd2c4f553e809fa18a6d27b6491b9d0180f19f SHA512 2f149be71d6b6713b554ed345c4b792e5af143413efe5d66893545cbbc62b83e427ae458a81ee2567f1001e8c3a4ad2efff644d4174a873411daf4cf7cce34fc
+EBUILD graphviz-2.40.1-r1.ebuild 7942 BLAKE2B 239e6bbb0f60b7f57e425fba8277e0105fa7ef436e504af8970ec89194aa29577446b75b2819d3e8fb5e70813a89dd563386cf0471abd94b79c692195b5aa02e SHA512 be6bc43f1df559f484492647f4e268f08a2e71dcb2c7e161a7393b55b982adaa6f62cb0da7c5edecd132cbc201eeb59acfe91a3bf3d7f27ab4b06d19c177d9c4
 EBUILD graphviz-2.40.1.ebuild 7792 BLAKE2B aa1a463791808a989f06a044d88c0f68f4bab6a6072d50114d59c35e39b083445898b6b8b086661ff32c84acf549014a06796ef279aa9090b23a132ca2a28c8d SHA512 25c9d1358f48f8ef0fea4040ca36d450b4ff7e29083407aa7b117a6792a330d7d0b2f2da1271eafcbeb16b2b1cd1d651a6d96898b2ae7c2e9abf3f712aa7ecfc
 MISC metadata.xml 2204 BLAKE2B cc6012ca977a477d6a557df8343e980e926f1e67f737064f3fea406db213e53c416db5fc50692b1132ebcd5b5ce52d4bb2f5a2cec91b0af846b905d36748e48c SHA512 cd26813c5d7d6341ae9a21be50ca4451657c9813e25b2d0d69cd972fbdecdacf63e763ecd1f1a56fee10f07a25e1063822f7b2e9a96df48e3bcf8c7d1d05de3a
diff --git a/media-gfx/graphviz/files/graphviz-2.40.1-qt5.patch b/media-gfx/graphviz/files/graphviz-2.40.1-qt5.patch
new file mode 100644
index 000000000000..02e81fac1d25
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.40.1-qt5.patch
@@ -0,0 +1,127 @@
+Submitted By:            Pierre Labastie <pierre dot labastie at neuf dot fr>
+Date:                    2017-08-27
+Initial Package Version: 2.40.1
+Upstream Status:         Unknown
+Origin:                  https://github.com/elkrejzi/pacman/blob/master/pkgbuild/graphviz/graphviz-qt5.patch
+                         Addition of patch for cmd/gvedit/Makefile.am by P. Labastie
+Description:             Fixes use of Qt5
+
+diff -Naur a/cmd/gvedit/csettings.cpp b/cmd/gvedit/csettings.cpp
+--- a/cmd/gvedit/csettings.cpp	2016-09-08 06:45:03.000000000 +0200
++++ b/cmd/gvedit/csettings.cpp	2017-08-28 17:05:32.226578375 +0200
+@@ -16,7 +16,7 @@
+ #include "csettings.h"
+ #include "qmessagebox.h"
+ #include "qfiledialog.h"
+-#include <QtGui>
++#include <QtWidgets>
+ #include <qfile.h>
+ #include "mdichild.h"
+ #include "string.h"
+diff -Naur a/cmd/gvedit/imageviewer.h b/cmd/gvedit/imageviewer.h
+--- a/cmd/gvedit/imageviewer.h	2016-08-09 23:02:09.000000000 +0200
++++ b/cmd/gvedit/imageviewer.h	2017-08-28 17:05:32.226578375 +0200
+@@ -15,7 +15,7 @@
+ 
+ #ifndef IMAGEVIEWER_H
+ #define IMAGEVIEWER_H
+-#include <QtGui>
++#include <QtWidgets>
+ #include <QMainWindow>
+ #include <QPrinter>
+ 
+diff -Naur a/cmd/gvedit/mainwindow.cpp b/cmd/gvedit/mainwindow.cpp
+--- a/cmd/gvedit/mainwindow.cpp	2016-09-20 06:45:02.000000000 +0200
++++ b/cmd/gvedit/mainwindow.cpp	2017-08-28 17:05:32.226578375 +0200
+@@ -11,7 +11,7 @@
+  * Contributors: See CVS logs. Details at http://www.graphviz.org/
+  *************************************************************************/
+ 
+-#include <QtGui>
++#include <QtWidgets>
+ #include <qframe.h>
+ #include "mainwindow.h"
+ #include "mdichild.h"
+diff -Naur a/cmd/gvedit/Makefile.am b/cmd/gvedit/Makefile.am
+--- a/cmd/gvedit/Makefile.am	2016-09-20 06:45:02.000000000 +0200
++++ b/cmd/gvedit/Makefile.am	2017-08-28 17:06:21.012476088 +0200
+@@ -30,6 +30,8 @@
+ 	-DDEMAND_LOADING=1 \
+ 	-DGVEDIT_DATADIR=\""$(pkgdatadir)/gvedit"\"
+ 
++gvedit_CXXFLAGS = -fPIC
++
+ gvedit_LDADD = \
+ 	$(top_builddir)/lib/gvc/libgvc.la \
+ 	$(top_builddir)/lib/cgraph/libcgraph.la \
+diff -Naur a/cmd/gvedit/mdichild.cpp b/cmd/gvedit/mdichild.cpp
+--- a/cmd/gvedit/mdichild.cpp	2016-08-09 23:02:09.000000000 +0200
++++ b/cmd/gvedit/mdichild.cpp	2017-08-28 17:05:32.226578375 +0200
+@@ -12,7 +12,7 @@
+  *************************************************************************/
+ 
+ 
+-#include <QtGui>
++#include <QtWidgets>
+ 
+ #include "mdichild.h"
+ #include "mainwindow.h"
+diff -Naur a/cmd/gvedit/ui_settings.h b/cmd/gvedit/ui_settings.h
+--- a/cmd/gvedit/ui_settings.h	2016-09-08 06:45:03.000000000 +0200
++++ b/cmd/gvedit/ui_settings.h	2017-08-28 17:05:32.226578375 +0200
+@@ -10,22 +10,22 @@
+ #ifndef UI_SETTINGS_H
+ #define UI_SETTINGS_H
+ 
+-#include <QtCore/QVariant>
+-#include <QtGui/QAction>
+-#include <QtGui/QApplication>
+-#include <QtGui/QButtonGroup>
+-#include <QtGui/QComboBox>
+-#include <QtGui/QDialog>
+-#include <QtGui/QFrame>
+-#include <QtGui/QHBoxLayout>
+-#include <QtGui/QHeaderView>
+-#include <QtGui/QLabel>
+-#include <QtGui/QLineEdit>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QSpacerItem>
+-#include <QtGui/QTextEdit>
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QWidget>
++#include <QVariant>
++#include <QAction>
++#include <QApplication>
++#include <QButtonGroup>
++#include <QComboBox>
++#include <QDialog>
++#include <QFrame>
++#include <QHBoxLayout>
++#include <QHeaderView>
++#include <QLabel>
++#include <QLineEdit>
++#include <QPushButton>
++#include <QSpacerItem>
++#include <QTextEdit>
++#include <QVBoxLayout>
++#include <QWidget>
+ 
+ QT_BEGIN_NAMESPACE
+ 
+diff -Naur a/configure.ac b/configure.ac
+--- a/configure.ac	2016-12-22 06:44:41.000000000 +0100
++++ b/configure.ac	2017-08-28 17:05:32.227578435 +0200
+@@ -2561,10 +2561,10 @@
+   use_qt="No (disabled)"
+ else
+ 
+-  AC_CHECK_PROGS(QMAKE,qmake-qt4 qmake-qt3 qmake,false)
++  AC_CHECK_PROGS(QMAKE,qmake-qt5 qmake,false)
+   if test "$QMAKE" != "false"; then
+-    PKG_CHECK_MODULES(QTCORE, [QtCore],[
+-      PKG_CHECK_MODULES(QTGUI, [QtGui],[
++    PKG_CHECK_MODULES(QTCORE, [Qt5Core],[
++      PKG_CHECK_MODULES(QTGUI, [Qt5Widgets Qt5PrintSupport],[
+ 	use_qt="Yes"
+       ],[
+         use_qt="No (QtGui not available)"
diff --git a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
new file mode 100644
index 000000000000..edc5a11b4af8
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
+
+DESCRIPTION="Open Source Graph Visualization Software"
+HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/"
+SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
+
+REQUIRED_USE="
+	!cairo? ( !X !gtk !postscript !lasi )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Requires ksh
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-libs/expat-2
+	>=dev-libs/glib-2.11.1:2
+	dev-libs/libltdl:0
+	>=media-libs/fontconfig-2.3.95
+	>=media-libs/freetype-2.1.10
+	>=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib]
+	>=media-libs/libpng-1.2:0
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/libiconv
+	cairo?	(
+		>=x11-libs/cairo-1.1.10[svg]
+		>=x11-libs/pango-1.12
+	)
+	devil?	( media-libs/devil[png,jpeg] )
+	gtk?	( x11-libs/gtk+:2 )
+	gts?	( sci-libs/gts )
+	lasi?	( media-libs/lasi )
+	pdf?	( app-text/poppler )
+	perl?	( dev-lang/perl:= )
+	postscript? ( app-text/ghostscript-gpl )
+	python?	( ${PYTHON_DEPS} )
+	qt5?	(
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+	)
+	ruby?	( dev-lang/ruby:* )
+	svg?	( gnome-base/librsvg )
+	tcl?	( >=dev-lang/tcl-8.3:0= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXmu
+		x11-libs/libXpm
+		x11-libs/libXt
+	)"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	sys-devel/libtool
+	virtual/pkgconfig
+	guile?	( dev-lang/swig dev-scheme/guile )
+	java?	( dev-lang/swig >=virtual/jdk-1.5 )
+	nls?	( >=sys-devel/gettext-0.14.5 )
+	perl?	( dev-lang/swig )
+	python?	( dev-lang/swig )
+	ruby?	( dev-lang/swig )
+	tcl?	( dev-lang/swig )"
+RDEPEND="${COMMON_DEPEND}
+	!<=sci-chemistry/cluster-1.3.081231"
+
+# Dependency description / Maintainer-Info:
+
+# Rendering is done via the following plugins (/plugins):
+# - core, dot_layout, neato_layout, gd , dot
+#   the ones which are always compiled in, depend on zlib, gd
+# - gtk
+#   Directly depends on gtk-2.
+#   needs 'pangocairo' enabled in graphviz configuration
+#   gtk-2 depends on pango, cairo and libX11 directly.
+# - gdk-pixbuf
+#   Disabled, GTK-1 junk.
+# - glitz
+#   Disabled, no particular reason
+#   needs 'pangocairo' enabled in graphviz configuration
+# - ming
+#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
+#   incomplete.
+# - cairo/pango:
+#   Needs pango for text layout, uses cairo methods to draw stuff
+# - xlib:
+#   needs cairo+pango,
+#   can make use of gnomeui and inotify support (??? unsure),
+#   needs libXaw for UI
+#   UI also links directly against libX11, libXmu, and libXt
+#   and uses libXpm if available so we make sure it always is
+
+# There can be swig-generated bindings for the following languages (/tclpkg/gv):
+# - c-sharp (disabled)
+# - scheme (enabled via guile) ... no longer broken on ~x86
+# - io (disabled)
+# - java (enabled via java) *2
+# - lua (enabled via lua)
+# - ocaml (enabled via ocaml)
+# - perl (enabled via perl) *1
+# - php (enabled via php) *2
+# - python (enabled via python) *1
+# - ruby (enabled via ruby) *1
+# - tcl (enabled via tcl)
+# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
+# *2 = Those bindings don't build because the paths for the headers/libs aren't
+#      detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
+
+# There are several other tools in /tclpkg:
+# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
+# tkspline, tkstubs ; enabled with: --with-tk
+
+# And the commands (/cmd):
+# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
+#   sci-libs/gts can be used for some of these
+# - lefty:
+#   needs Xaw and X to build
+# - gvedit (via 'qt5'):
+#   based on ./configure it needs qt-core and qt-gui only
+# - smyrna : experimental opengl front-end (via 'smyrna')
+#   currently disabled -- it segfaults a lot
+#   needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
+#   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
+#   with flags enabled at configure time
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch
+	"${FILESDIR}"/${P}-qt5.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# ToDo: Do the same thing for examples and/or
+	#       write a patch for a configuration-option
+	#       and send it to upstream
+	# note - the longer sed expression removes multi-line assignments that are extended via '\'
+	if ! use doc ; then
+		find . -iname Makefile.am \
+			| xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
+				-e '/^\(html\|pdf\)_DATA/d' || die
+	fi
+
+	# This is an old version of libtool
+	# use the ./configure option to exclude its use, and
+	# delete the dir since we don't need to eautoreconf it
+	rm -r libltdl || die
+
+	# no nls, no gettext, no iconv macro, so disable it
+	if ! use nls ; then
+		sed -i -e '/^AM_ICONV/d' configure.ac || die
+	fi
+
+	# Nuke the dead symlinks for the bindings
+	sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
+
+	# replace the whitespace with tabs
+	sed -i -e 's:  :\t:g' doc/info/Makefile.am || die
+
+	# use correct version of qmake. bug #567236
+	sed -i -e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt5_get_bindir)/qmake)" configure.ac || die
+
+	# workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
+	use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
+
+	use java && append-cppflags $(java-pkg_get-jni-cflags)
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--enable-ltdl
+		--disable-silent-rules
+		$(use_enable static-libs static)
+	)
+
+	# libtool file collision, bug 276609
+	myconf+=( --without-included-ltdl --disable-ltdl-install )
+
+	myconf+=(
+		$(use_with cairo pangocairo)
+		$(use_with devil)
+		$(use_with gtk)
+		$(use_with gts)
+		$(use_with qt5 qt)
+		$(use_with lasi)
+		$(use_with pdf poppler)
+		$(use_with postscript ghostscript)
+		$(use_with svg rsvg)
+		$(use_with X x)
+		$(use_with X xaw)
+		$(use_with X lefty)
+		--with-digcola
+		--with-fontconfig
+		--with-freetype2
+		--with-ipsepcola
+		--with-libgd
+		--with-sfdp
+		$(use_enable gdk-pixbuf)
+		--without-ming
+	)
+
+	# new/experimental features, to be tested, disable for now
+	myconf+=(
+		--with-cgraph
+		--without-glitz
+		--without-ipsepcola
+		--without-smyrna
+		--without-visio
+	)
+
+	# Bindings:
+	myconf+=(
+		$(use_enable guile)
+		--disable-io
+		$(use_enable java)
+		--disable-lua
+		--disable-ocaml
+		$(use_enable perl)
+		--disable-php
+		$(use_enable python)
+		--disable-r
+		$(use_enable ruby)
+		--disable-sharp
+		$(use_enable tcl)
+	)
+
+	econf ${myconf[@]}
+}
+
+src_install() {
+	sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
+
+	emake DESTDIR="${D}" \
+		txtdir="${EPREFIX}"/usr/share/doc/${PF} \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
+		pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
+		pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
+		install
+
+	if ! use examples; then
+		rm -rf "${ED}"/usr/share/graphviz/demo || die
+	fi
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README
+
+	use python && python_optimize \
+		"${D}$(python_get_sitedir)" \
+		"${D}/usr/$(get_libdir)/graphviz/python"
+}
+
+pkg_postinst() {
+	# This actually works if --enable-ltdl is passed
+	# to configure
+	dot -c || die
+}
+
+pkg_postrm() {
+	# Remove cruft, bug #547344
+	rm -rf "${EROOT}"usr/lib/graphviz/config{,6} || die
+}
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index ba39c3f0c4f9..5d01fab592fa 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -16,12 +16,12 @@ EBUILD imagemagick-6.9.9.18.ebuild 5128 BLAKE2B c5d4f87b3ea909fa94d940f24a7f01f4
 EBUILD imagemagick-6.9.9.20.ebuild 5120 BLAKE2B b02f1bdfe05aa3a9f96bdc3596b785326753f5249bf5b19ba70a6a76ad1dfddb453acdacef7ee3d1c80bb75017912e73b9650fe5fad688620fdaadb01d87574a SHA512 f7e5492163118e23d46829613a8bd380faee2e2c6e597b1fcde7f7a1684c80a45ad0bab4b39deac083b4136cedc789c128fb6809c824469bef66c3a904738422
 EBUILD imagemagick-6.9.9.23.ebuild 5122 BLAKE2B 16f53dfb31f82f636b577bb12069741b81c2fa91e5d0db9cf8e04d4f1056a6327cb465dd2206d3ea817a0b5a0a1f42ba14d05b82736a3b98cc1ccabbd8db4c3b SHA512 65388e8d87b190ef90fbd009794442778d4faf242f9589d988db156417d769e6f7239fb0b1bcaf972952796c438431860567c3b6c64e41d72759d03770014113
 EBUILD imagemagick-6.9.9.26.ebuild 5120 BLAKE2B d326a9da7f04cdaa555fceb7bfc8d2abaa491444cbf6617158ebdb967ac8cd834159d8f34827b939cc5f62109a5c294216b986149600fc47ce022145aa0cc402 SHA512 fa9f6c396f3c40d061a69e99380af48b5c5f377c1621a9835304112bd9f0f00f0cf02ba265c03f5d19696c9a5fccacb1f4a0ef6b0b02998966145557468fdcb7
-EBUILD imagemagick-6.9.9.31.ebuild 5123 BLAKE2B d640866948e34971bd4329a06e19afbbd2a69fec22992de17a5eb143be3391a7cc74dc287c1e599d5953d6e7040ccf5766cd4af2ca8fdc93fdad9cc358def0ec SHA512 19b072b6bcbd4fc7d51e07b060e1ec3f8980d6a31b84cfef428a7089c968faa60735ec09bfa49a441124ffa3ef682d233860b77432c8927ec30619768fa5b92a
+EBUILD imagemagick-6.9.9.31.ebuild 5122 BLAKE2B a28e1a67b75fa49d84f87b462c8ee0aa9d87d894eb8a667e59500b5ac7fbf4f4b3bc747013090b43aac651cdd50fd9e1db364836c49885f9df635e5362f4d08f SHA512 c0d95e39b63fab0e5126480ddf5ac6ab976bba2938797cfb9de159e2b3a39b6aba12371d3f3e1a2052413b2dd4a39eb7dbe7071f8fcdc67424875c9fd88bb61b
 EBUILD imagemagick-6.9.9.9.ebuild 5128 BLAKE2B c5d4f87b3ea909fa94d940f24a7f01f4026955e874868ad0d8124d941f06ddc0b24c3e11e40d6d825c3201d2b58a1d5446ce607a73ac62e13600d609ce1dc777 SHA512 86114b9cd2ffb6aa94808060abb78a03897e7ae0611b3c326ba60fe2ff17506209c413fc863a32ac63ae36d24ae2960cdc931b7b0493a8cb04189fa163990c68
 EBUILD imagemagick-7.0.6.9.ebuild 5134 BLAKE2B 3542aaffdbab0fa1e93eed3c67b923effd7bf418fe3e95b7501d8b1d36b3f6b81a2beb4bbdd8da29ac3bb96842a1f7bf8dbb72da0e2ed5dedeb4fc1a61fce1a5 SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0
 EBUILD imagemagick-7.0.7.11.ebuild 5128 BLAKE2B 283c66b5aadd9c405bb9fea2a51d4fb952793a8834ae0f55fe049c73633835c5de1f2acbe9d82a5e78218bad6b54240c113d408eda547c09fa6ce2f80cd2fe36 SHA512 e404fa7e419da2c4b191b5a348e6dc6dc843d4543742f60328ebc7dfe93f4fd487915223ae90a408c3a0c298ffc48cf4775718e61eb7c7298f2da79fdc611023
 EBUILD imagemagick-7.0.7.14.ebuild 5126 BLAKE2B eb993578fe4760505ee23640be3d2ce5a22a8b98f907b8d95af31ca8be0c86e0dc73839e95714d319803b526e8552e0cabeea109cfded0380c3e826861be12ba SHA512 48fb072c9315511b07f3787c972df301cdbf62a04b7a40ae7f23228ec96ecb8070f0c83e2ba4a6b93777ba9af2536b6a2640929ca9323539a5b2bd056c850b99
-EBUILD imagemagick-7.0.7.19.ebuild 5129 BLAKE2B 72846deeba463bdccb9d776b033ecfed9dc8f7f3863f79826064c760a4ce5b2cac11f3c486b1d99762c6de4031ab357f287c65304f03e70a9ac5d71f74061669 SHA512 eac788200338808bc1783281757fdc2891689826163e994ecb1e3bb9ef0d8200b60914d1a32a6070f23aee0baf32d58cea79adb856ddc2b26d229fb2555d881c
+EBUILD imagemagick-7.0.7.19.ebuild 5128 BLAKE2B 8700b5ee6fd27f87f1e5f5094f1c51b3ff66335485eed711dbbe966dc71162f77f2c5d59334cf321292c435c9976da770f22ce2dcd18e1bf4acdc70824c89f9d SHA512 73a59131ae98e2ce08905fe43e9c1918c824ce81c7f9dc1cecb6e269a0e374131af7cf8d2d355066647a10ef2c72c603d64f475893f82ebf2361f27f98bf0b60
 EBUILD imagemagick-7.0.7.6.ebuild 5134 BLAKE2B 3542aaffdbab0fa1e93eed3c67b923effd7bf418fe3e95b7501d8b1d36b3f6b81a2beb4bbdd8da29ac3bb96842a1f7bf8dbb72da0e2ed5dedeb4fc1a61fce1a5 SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0
 EBUILD imagemagick-7.0.7.8.ebuild 5134 BLAKE2B 3542aaffdbab0fa1e93eed3c67b923effd7bf418fe3e95b7501d8b1d36b3f6b81a2beb4bbdd8da29ac3bb96842a1f7bf8dbb72da0e2ed5dedeb4fc1a61fce1a5 SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0
 MISC metadata.xml 984 BLAKE2B ae695ec1fc34ad3b29269ad21cfb8b79ff6158a2ace9cd4194354448794dc183ac568757d6a7e6c07f31634dfb780e0411a0237b3c106344e6c7c7244a8aee36 SHA512 39a4c5aa27db2de81ad4621bacf43baf96415eecdf836fb2024890634c025b29f2b41dc003ac4d6f87b2365c1a4c68b6af2b9e169b3137bbee3e0a6cb435c5c7
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
index a88993b68f23..2fcb43f85563 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.31.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
index 5103125fcd21..5fb833caf4ca 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.7.19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/iscan-plugin-gt-f720/Manifest b/media-gfx/iscan-plugin-gt-f720/Manifest
index dc650b1ea766..42b4271b8816 100644
--- a/media-gfx/iscan-plugin-gt-f720/Manifest
+++ b/media-gfx/iscan-plugin-gt-f720/Manifest
@@ -1,5 +1,5 @@
 DIST esci-interpreter-gt-f720-0.0.1-2.i386.rpm 381387 BLAKE2B 1852f0f89e7181d8adad209d146e41f1a122e95256c073ef77b96338585520c25e287bff86a0eda8fd09733328a2c67c22bddffabfc37f5de7aef1726f5c997b SHA512 6ccc6f48d8c00614346a0faee798b876497ba5ac1b35e3fd558a6e01711b944dc713e654d53fff09daff00b91251150665932564fea4fc60ec1a0a7ec95fa1f5
 DIST esci-interpreter-gt-f720-0.0.1-2.x86_64.rpm 170040 BLAKE2B e46bc0841a872883b85b2d91cadcc1007e3639d0f1c6d64948b91a3fd65c66bf295102bd898b9a5b1fe671d0746023ed95ab1325418501f2176be17af88e1f67 SHA512 457fcfa3ae8291336a127e95dc81e24a2125ae8f861bf74d2006e4d019c54bd351c2480254b9173e52dfe489962dffea2819963596f280e1dc05c527fbf6b625
-EBUILD iscan-plugin-gt-f720-0.0.1.2.ebuild 1796 BLAKE2B 043066f45aebbf14b8854972b768136882c88074d54513190786143b05f482749c52294ae125606516a59f1a04ede8da285184dea1db41c88aefc81c0b6ab64a SHA512 f7e55bc3e4860c160b910e2c43c5b0fa42a8135da87ac733af10926edf6a43450e0b0f49470f57aaf1cd7817d9088d252bdfe272a9dc5cf93e434b70d49ac361
-EBUILD iscan-plugin-gt-f720-0.0.1.ebuild 1714 BLAKE2B f5f2103c5aab89c6762204e77472f4e68fd98f2ca7b9d510eec2fdc983d5e10ea511dd97848428f5eeea8dfffa6735fee15af887aff316619e11543c9e81c576 SHA512 a97b614e4315947f23fbac62c508c34784c1f39016e040a0280264497dcc5e9609bb58aa18bb2fb290aee0d59656ae3e45fbda11477a33ba9d770434835ef93f
+EBUILD iscan-plugin-gt-f720-0.0.1.2.ebuild 1572 BLAKE2B b4559ff53034389c89ce8c488aaf23773b758e329fbffaba0bf773c292bfc4e493d8881e9a8925e42f6f07351da1f57e668bd9c030d12bda10ea4c6341539d6e SHA512 3de21ed5ecf6c80465aefe88c7188ee8d83ff385304a68efc4fb84ceaf768cbbf6274f26c9fa303d012ce86bf428fb9f4001cc1c1dd3d304121bf53cf49899e4
+EBUILD iscan-plugin-gt-f720-0.0.1.ebuild 1474 BLAKE2B cb0e874d6f5dc2219a2452bf81e288a3375cdb06218b978787a6267f1c6215db5836886e35060b3fbb2e8089b12fe3c0b98d2d06332565fbe423b219d3a8d7cb SHA512 e32b2f4ffd7f61d4a615bcd7261464ea678aa7d6bb51eef63824ac018c936b6b7066c37dd55d94c2da463a2c110cefa4b949148d7d5bd086935a49a86adcbdff
 MISC metadata.xml 445 BLAKE2B b4b62d7f86b0897cac8ce562b27c0cffd16ed8f067f8095d4f1cb2315dc6740dacca43403085832063c3b0babfc74d326a4f2e139c1c571fc8aad832e4c8f9f5 SHA512 ed7c058931f20c758d70f6751841acfafdf388d98d17e80e700d69613e841cf883f02a3a134fb37e24c834012dfa0d8ec67b976ff866a90880b9b561f9c15164
diff --git a/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.2.ebuild b/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.2.ebuild
index 369ca44f7cfa..a09a64ceb97d 100644
--- a/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.2.ebuild
+++ b/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -18,11 +18,6 @@ LICENSE="AVASYS"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
 
-IUSE=""
-IUSE_LINGUAS="ja"
-
-for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
-
 DEPEND=">=media-gfx/iscan-2.21.0"
 RDEPEND="${DEPEND}"
 
@@ -37,13 +32,6 @@ src_install() {
 	insinto /usr/share/esci
 	doins "${WORKDIR}/usr/share/esci/"*
 
-	# install docs
-	if use linguas_ja; then
-		dodoc usr/share/doc/*/AVASYSPL.ja.txt
-	 else
-		dodoc usr/share/doc/*/AVASYSPL.en.txt
-	fi
-
 	# install scanner plugins
 	insinto "${MY_LIB}/esci"
 	insopts -m0755
diff --git a/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.ebuild b/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.ebuild
index 949f41b34450..be5793af5636 100644
--- a/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.ebuild
+++ b/media-gfx/iscan-plugin-gt-f720/iscan-plugin-gt-f720-0.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -20,11 +20,6 @@ LICENSE="AVASYS"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-IUSE=""
-IUSE_LINGUAS="ja"
-
-for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
-
 DEPEND=">=media-gfx/iscan-2.21.0"
 RDEPEND="${DEPEND}"
 
@@ -35,13 +30,6 @@ src_install() {
 	insinto /usr/share/esci
 	doins "${WORKDIR}/usr/share/esci/"*
 
-	# install docs
-	if use linguas_ja; then
-		dodoc "usr/share/doc/${MY_P}/AVASYSPL.ja.txt"
-	 else
-		dodoc "usr/share/doc/${MY_P}/AVASYSPL.en.txt"
-	fi
-
 	# install scanner plugins
 	insinto "${MY_LIB}/esci"
 	insopts -m0755
diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
index 99af9ac75391..b26fa5b67768 100644
--- a/media-gfx/valentina/Manifest
+++ b/media-gfx/valentina/Manifest
@@ -1,6 +1,6 @@
 DIST valentina-0.5.0.zip 37175844 BLAKE2B 73cfb434c87e7d59efa76c303f4cc13dd9df08b9d5f61becd03943b78ce68e8735d192f2f2d5d5dfe25cda19ba998b0ea4a73bc3d0845bd4a065f7c5b4e66098 SHA512 3e69f965de1f8179850a8c6a5a0d3b5e87384158191b9c4a3647a5421d1efe567e98298bd8f47a8288eac358520469ae7979a4a61df64ccfbeb1a36fb231efcf
 DIST valentina-4798.patch 25302 BLAKE2B 153cc2ccc603703a520b5181e5192bac86410ab51eec305effe43463ce081dbbf3bb48eedb93e8ea5928f3f71351526a175c61a23a7005fda5bf4e14cc57403e SHA512 c3adbd2caa4cfb73960de850b29bee881fc408c9e4032e1fa2f29ba80b91abaa194738ff1cfb607657343990a166ad310387a66ceca546ffae0543d774bc53b4
 DIST valentina-4802.patch 6733 BLAKE2B b7e30b77aab75b45e7bfd06165586f8356cfa438e0f5f5fb708d818f04fe9be7fdd025b8098cb5ca1f45cceef0671abf7014c112ab11da8e6c9c1a640e412ab8 SHA512 5628599c1dd208ba9ea8ea5e518bf6aed5ef11aa750670335478e5af49d6e9f235901c79d6483b1897f8288259fd06b463462eddcd062c4920ff251430998ff4
-EBUILD valentina-0.5.0-r2.ebuild 1895 BLAKE2B 2ed6fe888c35590809a91f34a14c93cd1c48dd69a17aa0d3c23cf6b7717fe4011d47a2fd4c3d30d4130fff7c187b996a681ec895209a1df6f4239c484b6af0cf SHA512 a099c0f97f93dbfda53db352babb77ca7c3edb9f12b2cbc1a0ea19d388d817aa5eb41cd65a0c9e8f9e417cca223128e40f119322a892c51a51ddb7fb01e78cb0
-EBUILD valentina-9999.ebuild 1506 BLAKE2B 73258a0bc81ede8c2f29f77653e241f4d281df2dd0006b93dc4a6795f569a3ec7703ac4b843fd313723086c17437281365340c0510c83f9af526db0e982570c2 SHA512 579149341dc7c3003a7d8ff3758df7247f50d8cfeba02f0882a9fa0ee37451d7fa4dc6cf0a1f3fb61582c4a73e8c37028558d12787f8a68bdce54a68b6cd9ba7
+EBUILD valentina-0.5.0-r2.ebuild 2416 BLAKE2B 6ee92fb4cd2519d6ec2ced5f21377a89142c83f6e4e9f064c0e0bfc88119cf3d191e5d9f4558228fd6ab30ab3ea9c8ca793b42e2cef2cc249a651fb61ac6b810 SHA512 af345b22a261444419c41dda8815be026952861fdbac348a2cdb17ef9dd558b654b376f3d11afb1d9649b478f42f12f0c5b1b26911b07217c037fd79d8323346
+EBUILD valentina-9999.ebuild 2013 BLAKE2B e16d40f731acab6ef308b85440654a5c9c7f210d76211b395da68620018a1c9fa4feb6a7f8f557a766c8f5147b1b50d09739d72416330380c57288bd28a4ff99 SHA512 8ba73f6f9ddd1a193ef34a11f6bbae68c462ce89964358ef1af6d708f5fbb65fc4cf6a5c71257d408f326dddaedce4dea9c46aee63bb7d1da006de739df7f616
 MISC metadata.xml 334 BLAKE2B 7f146a505a30d4461165308b40383e2b78998411874c8af6113c3040142003868f397872ecd22b9b8f3ec6193c532fa934c8646ee04e8c49157464b58035de09 SHA512 d1264aa0d26ba75466c5572c37ca6fd384d4e6db392aca0e47d4b1d0bd3ef7e035fed51c460af1bb258c500d1cc9211ec2e85db3e3aa158d378fb1389a3ebf03
diff --git a/media-gfx/valentina/valentina-0.5.0-r2.ebuild b/media-gfx/valentina/valentina-0.5.0-r2.ebuild
index 3ba76fa3cd6b..9b5a7f5ea11e 100644
--- a/media-gfx/valentina/valentina-0.5.0-r2.ebuild
+++ b/media-gfx/valentina/valentina-0.5.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,11 +16,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gnome"
 
-# en_IN not supported in Gentoo so not added here
-LANGS="cs_CZ de_DE el_GR en_CA en_US es_ES fi_FI fr_FR he_IL id_ID it_IT nl_NL pt_BR ro_RO ru_RU uk_UA zh_CN"
+LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN"
 
 for LANG in ${LANGS}; do
-	IUSE="${IUSE} linguas_${LANG}"
+	IUSE="${IUSE} l10n_${LANG}"
 done
 
 CDEPEND="
@@ -48,10 +47,62 @@ src_prepare() {
 
 src_configure() {
 	local locales=""
+	local locale
 
 	for LANG in ${LANGS}; do
-		if use linguas_${LANG}; then
-			locales="${locales} ${LANG}"
+		if use l10n_${LANG}; then
+			case ${LANG} in
+			"cs")
+				locale="cs_CZ"
+				;;
+			"de")
+				locale="de_DE"
+				;;
+			"el")
+				locale="el_GR"
+				;;
+			"en")
+				locale="en_CA en_IN en_US"
+				;;
+			"es")
+				locale="es_ES"
+				;;
+			"fi")
+				locale="fi_FI"
+				;;
+			"fr")
+				locale="fr_FR"
+				;;
+			"he")
+				locale="he_IL"
+				;;
+			"id")
+				locale="id_ID"
+				;;
+			"it")
+				locale="it_IT"
+				;;
+			"nl")
+				locale="nl_NL"
+				;;
+			"pt-BR")
+				locale="pt_BR"
+				;;
+			"ro")
+				locale="ro_RO"
+				;;
+			"ru")
+				locale="ru_RU"
+				;;
+			"uk")
+				locale="uk_UA"
+				;;
+			"zh-CN")
+				locale="zh_CN"
+				;;
+			esac
+
+			locales="${locales} ${locale}"
 		fi
 	done
 
diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild
index 3c119be7617c..7e393108cc1a 100644
--- a/media-gfx/valentina/valentina-9999.ebuild
+++ b/media-gfx/valentina/valentina-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,11 +15,10 @@ SLOT="0"
 KEYWORDS=""
 IUSE="gnome"
 
-# en_IN not supported in Gentoo so not added here
-LANGS="cs_CZ de_DE el_GR en_CA en_US es_ES fi_FI fr_FR he_IL id_ID it_IT nl_NL pt_BR ro_RO ru_RU uk_UA zh_CN"
+LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN"
 
 for LANG in ${LANGS}; do
-	IUSE="${IUSE} linguas_${LANG}"
+	IUSE="${IUSE} l10n_${LANG}"
 done
 
 CDEPEND="
@@ -39,8 +38,59 @@ src_configure() {
 	local locales=""
 
 	for LANG in ${LANGS}; do
-		if use linguas_${LANG}; then
-			locales="${locales} ${LANG}"
+		if use l10n_${LANG}; then
+			case ${LANG} in
+			"cs")
+				locale="cs_CZ"
+				;;
+			"de")
+				locale="de_DE"
+				;;
+			"el")
+				locale="el_GR"
+				;;
+			"en")
+				locale="en_CA en_IN en_US"
+				;;
+			"es")
+				locale="es_ES"
+				;;
+			"fi")
+				locale="fi_FI"
+				;;
+			"fr")
+				locale="fr_FR"
+				;;
+			"he")
+				locale="he_IL"
+				;;
+			"id")
+				locale="id_ID"
+				;;
+			"it")
+				locale="it_IT"
+				;;
+			"nl")
+				locale="nl_NL"
+				;;
+			"pt-BR")
+				locale="pt_BR"
+				;;
+			"ro")
+				locale="ro_RO"
+				;;
+			"ru")
+				locale="ru_RU"
+				;;
+			"uk")
+				locale="uk_UA"
+				;;
+			"zh-CN")
+				locale="zh_CN"
+				;;
+			esac
+
+			locales="${locales} ${locale}"
 		fi
 	done
 
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 54b0c5e9152e..e6c52fa0ff32 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/stimg/Manifest b/media-libs/stimg/Manifest
index b5534407566b..3e58351e953b 100644
--- a/media-libs/stimg/Manifest
+++ b/media-libs/stimg/Manifest
@@ -1,4 +1,4 @@
 AUX stimg-0.1.0-libpng15.patch 1445 BLAKE2B 69e11359652b1b075efa7a6a9d46decbecaa464f88b5cad7b2f23d43f3b1e825e9a017f107d1b0f80b735de5f5445b67d10aed92bc33f72ffb3a0e15c5aba03e SHA512 a615da45ba3579e92e246ead3784cba6802b4543c60528d7fbf7d660a7593e8083bab8d05a7c0f42fa4b0628c59c9cec5fc567a48f3c4627e05742e229f1fb94
 DIST stimg-0.1.0.tar.gz 187172 BLAKE2B 5e0a4d9874243bb1e1d3a092cc16cade427399de73cfb91fbf72e5bbd231d1e1ebaaccf4e0275dd5ec5a596ba35e7e6a124cd362c19759f88c2ea6c8363533ed SHA512 6a2b938e3fdac9bd079664a276e7091adc62fe60a386e5f575afe455e355e3639799171c0729131ee8d99c6b86776d64fecb3a85f15eb4ec5a4559e4cc1326a9
-EBUILD stimg-0.1.0.ebuild 760 BLAKE2B 315de6486ed026fe932162a391a6973e64969f1710d92018c51f2d1a066b37eaaff60a5149c69096a49ec9f13d2032f8efad3725713b5d3177054a4379b08c74 SHA512 3c7d65b16f699b39d56ed9c8efb270f99abba2bbe69011aba4d37ade2f9832a237521bdb1874380d8b5b8267c1873f11b0f98cdce17131a4d4aa8b0d79a2b131
+EBUILD stimg-0.1.0.ebuild 731 BLAKE2B cf94329f2221488913362b853600619e9b2306c5301aa80b3a9178da20958be16b1d393a6f261caddc59652696d4af811f77cafe55ccc997eb8b4d419f534fa4 SHA512 9b7b00e5f4f49380747c66b8b1d264fde910abc85d92afb71e357640b40f16f258fd7ea633c2dd0216dba0a28fd362ecdc4372e1176a13c3af1aac97ae61ed93
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-libs/stimg/stimg-0.1.0.ebuild b/media-libs/stimg/stimg-0.1.0.ebuild
index 970a96a7b2c7..3a7be52b0efc 100644
--- a/media-libs/stimg/stimg-0.1.0.ebuild
+++ b/media-libs/stimg/stimg-0.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -11,7 +11,7 @@ SRC_URI="http://homepage3.nifty.com/slokar/stimg/${P}.tar.gz"
 LICENSE="LGPL-2+ MIT-with-advertising"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc x86"
-IUSE="linguas_ja static-libs"
+IUSE="static-libs"
 
 RDEPEND="media-libs/libpng
 	media-libs/tiff
@@ -32,5 +32,5 @@ src_configure() {
 src_install() {
 	default
 	find "${D}" -name '*.la' -exec rm -f {} +
-	use linguas_ja && dodoc README.ja
+	dodoc README.ja
 }
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index ac644d9097f3..e169498a6c8d 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest
index b326bb89c06c..ee298515f61d 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -4,6 +4,6 @@ AUX vdr-epgsearch-1.0.0_vdr-2.1.2.diff 472 BLAKE2B fd9546d765d1df3405fafb14c6c90
 AUX vdr-epgsearch-1.0.1_beta5_makefile.diff 1136 BLAKE2B 3b82bfc71e75d02739f02071afb9cdc7d6fc0c0f0d7169b8f02a360c2b493d829f141dd586ce7d7f9a854f4b76423191e3f1b7a8df29b0c42beb037ff9cf9729 SHA512 79114081c2cb17402c0e0a431204d7afbc161a90d911d0c389a90f047280ee17b8112b3f2e9d32295c1dd15ef86695935a54354211c9b28669ad925df8173b92
 DIST vdr-epgsearch-1.0.0.tgz 667633 BLAKE2B 6a5c03b595f1f25c1f77b8e1e86f9a35a59ce20c258a196c5d828d48e139d25bf1d6c8da32d2e55fcc1576165c9f0c849e1ae8199657f062baf9ed738d97344a SHA512 3105dc847a75ad54ca854418a83db847942ba1d85f1c65a94b88310dfcdd5d614b89f0f27fd3ffc8e8c5db6c1c1e0f36e8e7a33cc71299922287f2d19dd385af
 DIST vdr-epgsearch-1.0.1_p20141227.tar.gz 472802 BLAKE2B 9ffc067c2aff29e3d79b620edf88ff7aca64ad5d1de3aa32b19fbc1889673e2439a6d65b46e2f3ff5fd3d416ff24cbafd6d41f562b3775210f0234c6990f03ab SHA512 952d58f6f03d2804f97be14779faf37c3788b42d78a6460102e2f1c74f6a58d7d68639e7e95e40f27417ce3658c0d5bf856399b6e8e8c214ea143d2865507562
-EBUILD vdr-epgsearch-1.0.0-r1.ebuild 2570 BLAKE2B 9e8e1b54d092c8d3766d42bcf1c8808298254a9d7dbcfb686026c1ebd404bccf70448682f0b863b5f51b3b0fe50768c02c18ce5a2749a57eff7380cb566e5b3c SHA512 b09d666f1c6a4ce1f6252b3106fe52f8080de341d2a75d299297d30e494351b6bbcca2a00c5b10730a29ca19cd82c23c966c2d5657cb1d28e37432d31b75ed86
-EBUILD vdr-epgsearch-1.0.1_p20141227.ebuild 2499 BLAKE2B 72f83545d5611cc93a8f69024ac13eb7e79685dae34a8b5e735b8d0664660cf56233fa1707924cc95140ceafa7aa9f07245250de1124cc6143f4db5331c0f756 SHA512 270f62da8f0f86a72545c1a4bfbf113be455a0a6c5206aeee105f6dd0101f1af9639c9dca8f5369e5bd19f6036114b7cccb480a09b28c5eda97bea7e7bd86744
+EBUILD vdr-epgsearch-1.0.0-r1.ebuild 2564 BLAKE2B efd5b036305aa8fca4486a15204cddf9a520443510968ed1751b890ef0c90c44e18dd018f500f3e19788ebf5df5274c5f919cb8276bb5f0deefc3c5f9479ea5d SHA512 19d9a030befb7d03c8eb2e817d70ab786eff287f9f9effb4f5fa8447ca62d9025c77b35c6b73eeaaf9c07936423c60c2297b2613411bb0dfbe73cbbd24487e88
+EBUILD vdr-epgsearch-1.0.1_p20141227.ebuild 2493 BLAKE2B efd5294348ca4f3147132fddce5bd7ba3977eed00859f17e4f2f2a43bbb0fb102c9bacb9e64708fad5fee59f765a1be819b1189ac47e4d2b1c097e2af45598f1 SHA512 36d6abf069c9bd7b718f77b221b43702ef047fcfba5f302d253d14e9e500e0aca7271ed068410056bdc3f1a6db784148120079a857f19760b1b17aacd0ea97a4
 MISC metadata.xml 490 BLAKE2B b4afc3665ad7e74d224ecadae3e002495c81ae2e64b10797cf363677e21c94def2049ef0ec5975367d8c0c091c80b1899b1794b067d0e70c4db6c085bd02cc42 SHA512 c112df3e2b8603a7e3f79ada4c26c6c18bdae8e6f22e66ae2a8eef924c29f11241a17053ce16eb59482fdc2753aeb6aff36c7dc235ef09042cfdc1c75564c29f
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0-r1.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0-r1.ebuild
index 17c89288b173..d550ca75a669 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0-r1.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,7 +22,7 @@ esac
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="pcre tre linguas_de"
+IUSE="pcre tre l10n_de"
 
 DEPEND=">=media-video/vdr-1.3.45
 	pcre? ( dev-libs/libpcre )
@@ -85,7 +85,7 @@ src_install() {
 
 	doman man/en/*.gz
 
-	if use linguas_de; then
+	if use l10n_de; then
 		doman -i18n=de man/de/*.gz
 	fi
 }
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227.ebuild
index db1b1a202082..fedaa7a512bb 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.1_p20141227.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -29,7 +29,7 @@ esac
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+conflictcheckonly +epgsearchonly linguas_de pcre +quicksearch tre"
+IUSE="+conflictcheckonly +epgsearchonly l10n_de pcre +quicksearch tre"
 
 DEPEND="media-video/vdr
 	pcre? ( dev-libs/libpcre )
@@ -93,7 +93,7 @@ src_install() {
 
 	doman man/en/*.gz
 
-	if use linguas_de; then
+	if use l10n_de; then
 		doman -i18n=de man/de/*.gz
 	fi
 }
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 623a56415e6b..677c12a11f86 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 86d142dfb7d7..f446ecf8b811 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -2,5 +2,5 @@ AUX clementine-1.3-fix-tokenizer.patch 674 BLAKE2B 6f5b0c6bd71887cbe9ce0f85a85db
 AUX clementine-fts3-tokenizer.patch 1395 BLAKE2B e3dee5d7e9856c6d3d5b69ad2d4a195a7016a7dcd0f01128dc24a22c10ea5cba0cc302852272ca4d45844c0003572809fa8d8c1a2e37524d2e8c75e64d96290f SHA512 c4623333086cebb9d56d11c4deb8837fc23aaff8ddda07bcb8bb1c0df90700d6923d51324823d23b317366180660de3993053d9de0ff5103d88f59143328627a
 DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a SHA512 39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674
 EBUILD clementine-1.3.1_p20171113.ebuild 4949 BLAKE2B c191c95fe3eeed9a429120b212e449b6bec7de077f0da771612fb5a3d04c3b3d64f34c92ba48fb13037f930a243695fe0768ce0df03b877f7f4479dd8bcc6d48 SHA512 5a6038ab815b894e46c1f5d84c73754a3265e105b7aca76e4cb828749d3fad64fd2ea5ea153dd26ebb602bcdd6510a185c6547df5d5e4950372a1e8ce7cc6020
-EBUILD clementine-9999.ebuild 5195 BLAKE2B f19ba92eb4765b208ac633176583183e2277d964be17fb84224a89440a270c00ec70a73d08da844b1343e055f670aaf3bf9afc283d38360535b024e2b19e94fa SHA512 dca3b14b5790ed68f2afe15191ba4ae09459b1ef22894d826e8d38eef0fe8bcb44bf45563a034cd339baaa1f26ec835c7182455aecb43dd401aee6b9f820c520
+EBUILD clementine-9999.ebuild 5176 BLAKE2B 423a007735c3e04ae15a1440278ba5c17de46419c12fdfcfb739681ef3ebedbb528d007e436cfd31d62d749ee45321da3b782fbf516d9c9b62033684bee8315f SHA512 7f86faf6d5346c6385a2452336fdc718220c857f4975273863c589b30b21155d3cf2574ef3df147420ad607c9af1d7bce3412b58dd1858d82e79972c8968c3f2
 MISC metadata.xml 1415 BLAKE2B 9bdad36fc6b032413a003f93cb53ccc439d6dc437d8ab6b7da03ea148a550eafe5ec6910c984e90abf39bd4a427567a7e5de98fea8a36ed54452fc822ef28dda SHA512 02122e10260ba62b72ea2a5de32eb45fb1578cfb20f67294467ff2fcc1ac78f917dc415cf0c5dd587c509c5e05420a07c7c75379eb88fd97f03b962c77fd2213
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 567383c9fc22..518f5159473c 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -39,7 +39,6 @@ COMMON_DEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index 6b1061697acb..c5d1181b5399 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,6 +1,6 @@
 DIST lmms-1.1.90.tar.gz 16580373 BLAKE2B 7ae6025647f949aa015dc64cb6595e1e13b21c9a9d72699f464c4ab15f3213aff353df840cf520ea48611f45d0aba2cec7c2fbb6ac9610ff816dfe9c81d57ea9 SHA512 4e8bc4ec70c613b69ff14e463860e6f86236cb7b238529d41c4e9cc1b9642590110d1d07f87b9e2a4e139454c3a1f851f95a5eaef12e95660b50dd6ea17aa486
 DIST lmms-1.2.0_rc4.tar.gz 16596115 BLAKE2B ec8a132f900417749899b084915d31348e267aebcded218d919559f195ce4826091bc3576932d2fa9115c2e040ba73b84db05eeaca3fbcf33b930791241de990 SHA512 8f102f2a4f157da1b8477d4f73bd5b86e7d11453491f6764deed1c61654c0836e612e19d1dac33d154ed9d1b0a0c65084a0537be832c94e72b904264269b6a96
-EBUILD lmms-1.1.90.ebuild 2027 BLAKE2B 4a847d6895153ee0435506be1c5af26f4ad22309d4fad497df9a92272cc8ebe109590a76f6c1464996c70979cb70f1d876c7b3305e1135b14fab511318196914 SHA512 3c123fb8feb464d4df36391ad80c0091a298373febe2c28d9505203aafd0ac35f41e2eb42686683e443b2c4048a21808aea9124367a8df5e7fc60e87bd3b7c4b
-EBUILD lmms-1.2.0_rc4.ebuild 2222 BLAKE2B 2539df372da651a4af7b4f7d0b475a19827b2aef2a283d25312d4cef74692917b3d162449311eec00e339e29c5d1c94585634e6ee257a96dfaea4e1f5edfab9a SHA512 68294f2d8925d50a6f96da31a8a3b9379871bf69eb056f254bef5f667c26a4911c4d3c524514ac924178a8cfa67c55fda95df4bef28842fe80b868dcb95a5736
-EBUILD lmms-9999.ebuild 2222 BLAKE2B 2539df372da651a4af7b4f7d0b475a19827b2aef2a283d25312d4cef74692917b3d162449311eec00e339e29c5d1c94585634e6ee257a96dfaea4e1f5edfab9a SHA512 68294f2d8925d50a6f96da31a8a3b9379871bf69eb056f254bef5f667c26a4911c4d3c524514ac924178a8cfa67c55fda95df4bef28842fe80b868dcb95a5736
+EBUILD lmms-1.1.90.ebuild 2001 BLAKE2B edbfb370f068786cb2d2d2bd39a3d3203a3c200c52846ac76f5e3f4727a2ce32be8e4585c52a955cbc6eb71e95c0a7a5fca1f99c6549513c8ac52cf465ee6ccf SHA512 0bd83dc94431a467567174d65361c4b381a1286b3941e319d33a72297cccde9ddcec6a885938a51cf4e0c3ffebca0d45d4c0c6004c5e46077a16bdcbf0f42474
+EBUILD lmms-1.2.0_rc4.ebuild 2196 BLAKE2B 787ecdc79503e230b29af3097fa7b77db645f63ee593e871f1f20df13da50dbf7964c39adb4818193bafd7652d935e526f70097d04ab990f5c0e8658c5dd5c93 SHA512 fc471f52db5555c85970aa66acfeeeb553df13c0bacf946d8612cf30cd45ec6bfc70e8e8d8103e97fdd12a5e46da3ea8bdad5dbeffb28d48ef9ca5ba66bf144b
+EBUILD lmms-9999.ebuild 2196 BLAKE2B 787ecdc79503e230b29af3097fa7b77db645f63ee593e871f1f20df13da50dbf7964c39adb4818193bafd7652d935e526f70097d04ab990f5c0e8658c5dd5c93 SHA512 fc471f52db5555c85970aa66acfeeeb553df13c0bacf946d8612cf30cd45ec6bfc70e8e8d8103e97fdd12a5e46da3ea8bdad5dbeffb28d48ef9ca5ba66bf144b
 MISC metadata.xml 956 BLAKE2B 0146d8de32c1f9aaa1b111f10e48de20bde5e3634527b4da37ec14d2a148e6eb974bf6665e4fe6254732dff28ec24e3ca7fd1d7b860928453a223bd183895715 SHA512 d96540b061f24e031f1cbb381c05f4eb368e207f8300e8b68e57a36deb2bfb6108453e8428e2534e895927a738d74d8692fc918d8456e0f01b5ec971d4400acc
diff --git a/media-sound/lmms/lmms-1.1.90.ebuild b/media-sound/lmms/lmms-1.1.90.ebuild
index e76edef817b1..a3e5bc6169a4 100644
--- a/media-sound/lmms/lmms-1.1.90.ebuild
+++ b/media-sound/lmms/lmms-1.1.90.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -44,7 +44,7 @@ COMMON_DEPEND="
 	)
 	soundio? ( media-libs/libsoundio )
 	stk? ( media-libs/stk )
-	vst? ( || ( virtual/wine app-emulation/wine ) )
+	vst? ( virtual/wine )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-qt/linguist-tools:5
diff --git a/media-sound/lmms/lmms-1.2.0_rc4.ebuild b/media-sound/lmms/lmms-1.2.0_rc4.ebuild
index 22f4af150adb..354ba7ece7b3 100644
--- a/media-sound/lmms/lmms-1.2.0_rc4.ebuild
+++ b/media-sound/lmms/lmms-1.2.0_rc4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -45,7 +45,7 @@ COMMON_DEPEND="
 	)
 	soundio? ( media-libs/libsoundio )
 	stk? ( media-libs/stk )
-	vst? ( || ( virtual/wine app-emulation/wine ) )
+	vst? ( virtual/wine )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-qt/linguist-tools:5
diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild
index 22f4af150adb..354ba7ece7b3 100644
--- a/media-sound/lmms/lmms-9999.ebuild
+++ b/media-sound/lmms/lmms-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -45,7 +45,7 @@ COMMON_DEPEND="
 	)
 	soundio? ( media-libs/libsoundio )
 	stk? ( media-libs/stk )
-	vst? ( || ( virtual/wine app-emulation/wine ) )
+	vst? ( virtual/wine )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-qt/linguist-tools:5
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index d7832d91e342..346dca6cd509 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/dvgrab/Manifest b/media-video/dvgrab/Manifest
index 22d15f29b902..43e4be21f9a8 100644
--- a/media-video/dvgrab/Manifest
+++ b/media-video/dvgrab/Manifest
@@ -1,5 +1,4 @@
 AUX dvgrab-3.5-gcc6.patch 993 BLAKE2B 30242bea0152f7d5adff59a5b2e2965dafd21d37835b625321ace52b2aa06a6789eb2101ac06f35a2f548a26253a396446f8e0c961abbbeb7ac3aa1b1f5dbbe8 SHA512 db155702d050c58b7833c609e5e1a38f91256b5bf5b8c6c8619648e12851924fb0177ad7930f4dd77671bd6515abfd6059ed5ab5611aef9b6ba4e3c8260b88b0
 DIST dvgrab-3.5.tar.gz 205268 BLAKE2B c92cfbe3257b71fe0cd8b3e403080c5bd37a10d675ea0b3feafcf01f825229d102338cc7ff1084a5c3abee8b8299276737923177229629b4418aafff020cb5eb SHA512 7d9cae1661d27dbef1d0dcdf18966a0ab386d936803ff7d071a18e0303fca45631c9b27187a413adfa4391c395e5909e3b8dc5c543d529e7805550f1a3ee6735
-EBUILD dvgrab-3.5-r1.ebuild 703 BLAKE2B f90e5092fcd841ba80c2b48288e920fab267a08b9c78fa302969ff594779fae1e678fddaf91ebda56cae9a5e5296e95232ee7e6361fd313a2a4702e4ed2f498c SHA512 7b69a494b15e3983ad2b4bfc701f49e7b327befee32168d57ee8789b608f45a366229f20d4b4e9c3ed31caa4c007a214f3a6e0fb0c29937116fc43babf1a8ec3
-EBUILD dvgrab-3.5.ebuild 787 BLAKE2B c779f8b3c51b57cbd6f6640ceae2efb25ee6a6ab7d27360874acc2b60999f1e1ec7f99683882e38c54cd762afc0f6b88357c23ff7d1ea5ee1f6ff9b91a05ea52 SHA512 6c9a164a8837d2279710ef04744313edc2d210574615903ae079219b69f8036394df9d11eac390b7c44be77f7c1e23678058fca61347fd2c58edb9084b045590
+EBUILD dvgrab-3.5-r1.ebuild 715 BLAKE2B e7353533f14a1b291e258352d6c8bccc8500f97c0d98695b1aafcaf69f93be4a68386f16acf15c084f7d10669407ba30351a1b11bed2cba3760645e78a8e9b1b SHA512 9f1e98cb8bcc8e93bee1fa2a50e53928455ffe6cd9c8d5b0b577063562740f070bcde2fe46b9c40adaa1866be1ee5bc1f4e3fe59e4c07a97e9c713dc298444df
 MISC metadata.xml 305 BLAKE2B 3d3abfc411049dbe9748c1483c791a03abb9ee4a52d1c4ea5a86aae2873144bcd7c14b7c093a7aad13f51bc4851ea3bedfcc8bb971439bb1173f85ed2ad7026d SHA512 957b950aea4b4ee25ebd490de7176fc07213a64237b20ccd17eb34e37246f133d86f9f726f64d71d4ebdd27b088e2259d6ffec85ea1221108becf559283b07ec
diff --git a/media-video/dvgrab/dvgrab-3.5-r1.ebuild b/media-video/dvgrab/dvgrab-3.5-r1.ebuild
index b47cedd70929..4729214c762c 100644
--- a/media-video/dvgrab/dvgrab-3.5-r1.ebuild
+++ b/media-video/dvgrab/dvgrab-3.5-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Digital Video (DV) grabber for GNU/Linux"
-HOMEPAGE="http://www.kinodv.org/"
+HOMEPAGE="https://github.com/ddennedy/dvgrab"
 SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-video/dvgrab/dvgrab-3.5.ebuild b/media-video/dvgrab/dvgrab-3.5.ebuild
deleted file mode 100644
index 789b98b6698c..000000000000
--- a/media-video/dvgrab/dvgrab-3.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Digital Video (DV) grabber for GNU/Linux"
-HOMEPAGE="http://www.kinodv.org/"
-SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="jpeg quicktime"
-
-RDEPEND=">=sys-libs/libraw1394-1.1
-	>=media-libs/libdv-0.103
-	>=media-libs/libiec61883-1
-	>=sys-libs/libavc1394-0.5.1
-	jpeg? ( virtual/jpeg )
-	quicktime? ( media-libs/libquicktime )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_compile() {
-	econf $(use_with quicktime libquicktime) $(use_with jpeg libjpeg)
-	emake || die "emake failed."
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
index f5972756fded..91b3e3670a4a 100644
--- a/media-video/kmplayer/Manifest
+++ b/media-video/kmplayer/Manifest
@@ -6,5 +6,4 @@ AUX kmplayer-0.12.0b-qt-5.9.patch 1097 BLAKE2B 093961b12c4482303c43b603ad30c5fb4
 AUX kmplayer-0.12.0b-schedulerepaint.patch 2085 BLAKE2B a8c51d503de212b375cf77c41cf1c581c80decfdfe30cdd98ac0ff3f4b8a7bc335e921762808994c298db47e6327bb768838c00b41e8d20e6bb211a2c62ef6ff SHA512 e3c874ca5886d3a16eab0f10169009317214c8c196d9ce70b797f97f1ed2ed9143fb31e7f99d711a2c9ede26cb957f767fabbeb3c6670d430b1d4061a02982f1
 DIST kmplayer-0.12.0b.tar.bz2 599496 BLAKE2B c27b54cf05c52ffbb78c8f623b7cab066901f647c14364da1de2fcedd96329439521ad329fc15be58491b570de17fd151c95f266738e049501a5a22ba8dd9c93 SHA512 d34c496d0c24c6d5c1bb675b83fac60da5c9672e4076aed72bac2e9b333e88d031076e7e386ec7b61ae8ece88870f6187c61f483f425aa78edd1e443c7f2e882
 EBUILD kmplayer-0.12.0b-r1.ebuild 2411 BLAKE2B 8dbbdffc72deaddc831fd7c3ed2965befd532fc25206ff0a37ca3075d5e8ff5db25963eccbb82adba0cd5a7b602220035143273931c3a83613939d7b62a00b6d SHA512 acc899ef9080136d6ff976c37fd5676cd3b7c3ea04c4e1776e7c3408bcb951b49420b633d8622761f3c570694e79615ba92a96382890ee88dbdc2ce522abf56a
-EBUILD kmplayer-0.12.0b.ebuild 2103 BLAKE2B a60e24e72562d7cc85741bfd6c384bb626790714221ee0f670e3221a80923c87bbbedbabd0622cefbfc657c5be3b3fc4e6e03f5cef03cdf926f1287109ecfb34 SHA512 3e64bf1ecca26da93c2e6417a811a9610d7cd5ba4b5216bb53891bc47b4215dbe845bb0d68ea9532f0ac12e9f398f17727382468e6b4e67e05e7afe7cb80933f
 MISC metadata.xml 475 BLAKE2B 3c086dc3f1ddb849cf673de7aa73a3d68bc7f24537af193dca8e4f65fe28147f85b05bb8c88d591df95fb1f001ae2fe8b5f414eaf10cc314363c91185b4eb0da SHA512 0f45fbd4596c4e885093addcf323d7c53a5d550f91bd9bf0bcf5bc18cd9a808caac52dee949ad5437a1e6827b1b6bbd42a81a563eb648ebad64a6a7a6c34e37f
diff --git a/media-video/kmplayer/kmplayer-0.12.0b.ebuild b/media-video/kmplayer/kmplayer-0.12.0b.ebuild
deleted file mode 100644
index 91517704d76a..000000000000
--- a/media-video/kmplayer/kmplayer-0.12.0b.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Video player plugin for Konqueror and basic MPlayer frontend"
-HOMEPAGE="https://kmplayer.kde.org"
-SRC_URI="mirror://kde/stable/${PN}/${EGIT_BRANCH}/${P}.tar.bz2"
-
-LICENSE="GPL-2 FDL-1.2 LGPL-2.1"
-KEYWORDS="amd64 x86"
-IUSE="cairo npp"
-
-CDEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kmediaplayer)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libxcb
-	cairo? ( x11-libs/cairo[xcb] )
-	npp? (
-		dev-libs/dbus-glib
-		dev-libs/glib:2
-		www-plugins/adobe-flash:*
-		>=x11-libs/gtk+-2.10.14:2
-	)
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${CDEPEND}
-	media-video/mplayer
-	!media-video/kmplayer:4
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.9.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-
-	if use npp; then
-		sed -i src/kmplayer_part.desktop \
-		-e ":^MimeType: s:=:=application/x-shockwave-flash;:" || die
-	fi
-}
-
-src_configure() {
-	# 0.12: expat build broken, check in later releases
-	local mycmakeargs=(
-		-DKMPLAYER_BUILT_WITH_EXPAT=OFF
-		-DKMPLAYER_BUILT_WITH_CAIRO=$(usex cairo)
-		-DKMPLAYER_BUILT_WITH_NPP=$(usex npp)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	if use npp; then
-		kwriteconfig5 --file "${ED}/usr/share/config/kmplayerrc" --group "application/x-shockwave-flash" --key player npp
-		kwriteconfig5 --file "${ED}/usr/share/config/kmplayerrc" --group "application/x-shockwave-flash" --key plugin /usr/lib/nsbrowser/plugins/libflashplayer.so
-	fi
-}
diff --git a/media-video/tsmuxer/Manifest b/media-video/tsmuxer/Manifest
index 984c6bd7dbd1..28c052ae6604 100644
--- a/media-video/tsmuxer/Manifest
+++ b/media-video/tsmuxer/Manifest
@@ -1,6 +1,6 @@
 DIST tsMuxeR_shared_1.10.6.tar.gz 640010 BLAKE2B aa60341e372d7537ea881ac481f7052af3cc0db5d2eb61687bc23ebdaefcaa8b04f9a4e02075489911c885563f172ec64fd3f54779d130f404ac96378d839ecc SHA512 64d5214a84ae1d2fdbaad214ff9586007ed1d88e7d0e18d866dfe4e75cf371de52e4c05eb1d67d0b9c7c2f9cd5ca87b4dbb2b113e81361ba658aa1fecca115d6
 DIST tsmuxer-2.6.11.tar.gz 538798 BLAKE2B 18f5f9002e356664ae84343afbadcddd447743404bcdcca709ba039ebb2ab05e5fba7eda0f30c86c29e18040d646004d1aec7dec34ed008ddbdb15228c63f09d SHA512 25b552153b76231ac1b88858d2178564d22edd18c6b08dc872765ac214ca6fd1ff6df5c5fff0f24647ea35f3f990e364bfb8adff5dd79c69cc12875fafb4f137
 DIST tsmuxer-icon.png 1634 BLAKE2B 400a1101ae382264d66a07e389157f055a7346c80065be159ffda6ce8c28450c1ff954b50fd1ce6df05384fdb892eeab7319bc42f154878c2fccfb5638b90a3d SHA512 4af3b1bd0e1a2c8379773e16121aa1c0ae749a3a9b9fdef0622991ea4ea632f51fbd91af0f6b5a415c28b375bd71adde2e9aacfb8b495242168cc97e1c8bf4ff
-EBUILD tsmuxer-1.10.6-r1.ebuild 1847 BLAKE2B 7316652ccfc87a0fa8a6295aae100e4d9860c704c26faaef12818cad47f04a1f972771e14f7aaa6883b59dbbe7ea9e6d3e22f7f094c2af377499d7be43909ac1 SHA512 c83969d2f7d050010b8ac2d78b2a231140955f854e09a58feb8b7be299fd7affcee4f4ea38b899b6d8538f56562822d61fec717ec96ba5f0b671af1c14f991e6
+EBUILD tsmuxer-1.10.6-r1.ebuild 1841 BLAKE2B 88dd2d6a43c2772787b7a2be1d07c54e0e03ac9df095118570eda6ac26e8ef5c6b92b24c70c6d245a7d73b9132e695f72ca0e86dd71cec85dcb384e4fbe93202 SHA512 7dc81a67b021580d395caec24a067646a77569a493f5a0f3568f70a14ca4b776b5be398c7da6958c643967f2ec129113d253d6cc4834a74e099d15b5d23e5878
 EBUILD tsmuxer-2.6.11.ebuild 1579 BLAKE2B 4ac8a08e0051002674b3e76983ca73423c941a7d2be5eeb8b0128f3cb5906799afdd014c5bc74861fcc6c91c2b8d58a7da05e91ed86a1dc49f0e64244c659535 SHA512 8c381c1db6dfa56dd668a9963bd6dde4b8221382f8455a99f49fa7db91f3fe3bcaffefb0eb6ea59461d8fb97ebd185968fad446ee43a919a23302c1b1bd733a3
 MISC metadata.xml 645 BLAKE2B 8361c4d4af9715af8709b464ca2ce53b3a826f448538f4ed9c631ad8be42cb67abe2dd39ef1dee8e3fc072634f3c186cdde51b5e7acf88097f4b60d4cfa25ad7 SHA512 66d7f11ae0acb6082f91b40fc3c5990f0f957a82d722bee2958b9cc3ea0bcd2e094f4be0e1984397c6664267328ef5212a2131a1fb20d191b3a81b6cf9d524a1
diff --git a/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild b/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild
index f01350190c79..5734f9720e38 100644
--- a/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild
+++ b/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ LICENSE="SmartLabs"
 SLOT="0"
 
 KEYWORDS="~amd64 ~x86"
-IUSE="qt4 linguas_ru"
+IUSE="qt4 l10n_ru"
 
 QA_FLAGS_IGNORED="opt/${PN}/bin/tsMuxeR opt/${PN}/bin/tsMuxerGUI"
 
@@ -73,5 +73,5 @@ src_install() {
 		make_desktop_entry tsMuxerGUI "tsMuxeR GUI" "${PN}" "Qt;AudioVideo;Video"
 	fi
 
-	use linguas_ru && dodoc readme.rus.txt
+	use l10n_ru && dodoc readme.rus.txt
 }
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 6c999f43dae3..b2adff27f632 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 2f6ffc4a1ba3..a90a981eef22 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 06 Jan 2018 22:09:02 +0000
+Sun, 07 Jan 2018 17:39:09 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 43b0b802a5d4..284b40d1986f 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 412859 BLAKE2B 29f22611257846c43da3f994e05684673fa1caa957a4b148f39ff19bc84f3682e8490d97c111e7eccbdb376d70136a0d0906ef152ce3abf044f4fb391eb520c4 SHA512 49d32fc5be9c59d40fa5555276aaf748a6274c5421c12e450644629355174f7bb6f7e77103a5571ae8f5e28bcd53505531ac68ed8f7957c3debfc9196bd152cd
-TIMESTAMP 2018-01-06T22:09:06Z
+TIMESTAMP 2018-01-07T17:39:12Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpRSQJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpSW0BfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBWchAArF3aT/UQZcrb3cj7xK20ozHfHs8IaK04vfcG7f8i6LoFOMjuZJB4QZl0
-9DdXSA1vmXBrEe2qxwUU5+JaW6khJXywKodTJIB67/tIVqZBirBdXdyfd81NjOSy
-tHoyxqdk+rTLKc/RnYoxfmHJkVm2gPi/K/VTRSdmGobj9K40VItkvrUjajRXOEfM
-7LP8UxWAljkj+NGhOcvBacZ5HjPwETlemn+KIDZXKm9jrI0DfW/X6B2fpudrb13B
-lNBId0zEf4dgEtNYoezgiA2PAxlQLh1iQ/OdiB9/EkA9acN5ZVdO/gTgA5uk791L
-RSljkOJ4t4jj65cVZroYDHynnBTfC6tEe7a1yZvDMqIQyHsW1ekYaMNdYXKqQqcn
-BqqzvxsbCNT3xNujdTuEdgP18hJkT6n111AHedCEcyryfteRLLTk/lEHdMXec9o1
-9eAJR/yVosYfZM0n9vtqocW/VzHs4tg7W1jclnIpbKdADbo132PH0OKkes+ExjTK
-eZADz2QErADY3BUISMm7REIfCx0PUhhsCZ6jbRc6Tq09F26ZGNyjLRgkkdVqpYhg
-vn3n5LR3WFIv7qo31ArqOQ8y2OeUIM+h9hIyArmCMBJphNQ04Mi9mKw0EmZ37Sz0
-2uu6zlsVLSDujmhJeaB2r6a3jCWaQRsD4YiCNTh/XOdprMdsxrQ=
-=9qbz
+klD9oRAApKlg+9T0h/8HduioYXVIXTruWbF364BkDt5xlXVqyh204XTwjiZ9LwbK
+mkXHIe3WTHb3+GEbtrnnnewIOEUhm99+GvROXN320ZWmhqPkg03pG1KfE5V0zd+H
+puUijolR5qZGmQovk6Xy1gNG1KVoirUgUxBb6MmXfMEHetHCglduRCCcVj5jsMl3
+nOzXWnB+k+U5czmroxBOeK+jp5QvkQ8PozGuJnYD747HNekwb0Hv8nfZz2YL2ORL
+eDE8tys2ZCSX+UlDH1aPX3sf9fUHcpcnvVM66W/+vLEnOjOq9tZvAXga9rTnSucZ
+4mg7e1vPyPHVTeBdaLDvyhvGRBdsfMNOYA56HPrCg7JTuQh1hZX6wWiwxAbPv18L
+lauRs/gb8WRRQNWvBeEg1jtwCoIKKutZp//xgEieKlr7FQwfm+p8jMOhvVJjWKW/
+N+u5OkGHry6BZ6FLJtSyLgOR5RqZ+TF+7FGOzOmnMA2TAmPUAj/bEhflWTfIAYQW
+mkKrnCxQa7+GRtPokO8ydbPmxlckfa8mABXRVbaGJWpX/2pXczCoLcjbpR1DG6ir
+lgMYQmqUqcbWoFmYVtAvPtlQkavn+3Jo3fNdReGSyVQ5Uv8iplhUDgrUqiqMP8Yi
+1DvBJyPmAWefkHuWcnM3Y71kU24n0r0T3o3P0KIm6zGcUBhVasY=
+=zDn/
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 2f6ffc4a1ba3..a90a981eef22 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 06 Jan 2018 22:09:02 +0000
+Sun, 07 Jan 2018 17:39:09 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 09087bea0090..888712a3b65b 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index fe4deef0e553..00e0a1f2c103 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/ansible-2.4.2.0-r1 b/metadata/md5-cache/app-admin/ansible-2.4.2.0-r1
new file mode 100644
index 000000000000..ebce2bc67f95
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-2.4.2.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=6
+HOMEPAGE=http://ansible.com/
+IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://releases.ansible.com/ansible/ansible-2.4.2.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=43b3e31fe01c70b2d9ff90ac870d6964
diff --git a/metadata/md5-cache/app-admin/ansible-9999 b/metadata/md5-cache/app-admin/ansible-9999
index 091a3ba15b10..1b9476dd452d 100644
--- a/metadata/md5-cache/app-admin/ansible-9999
+++ b/metadata/md5-cache/app-admin/ansible-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <dev-python/mock-1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/packaging-16.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/httplib2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/netaddr[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/sshpass virtual/ssh dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/passlib[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-vcs/git ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Model-driven deployment, config management, and command execution framework
 EAPI=6
 HOMEPAGE=http://ansible.com/
@@ -9,4 +9,4 @@ RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,python_targets_python3_
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b299ccc0d8b6ceb65b9764d2c03087e7
+_md5_=0cdad8582e142475bf9563d2654ba2cc
diff --git a/metadata/md5-cache/app-admin/sysklogd-1.5.1 b/metadata/md5-cache/app-admin/sysklogd-1.5.1
deleted file mode 100644
index cc4ece4e8895..000000000000
--- a/metadata/md5-cache/app-admin/sysklogd-1.5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Standard log daemons
-EAPI=4
-HOMEPAGE=http://www.infodrom.org/projects/sysklogd/
-IUSE=logrotate
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-lang/perl sys-apps/debianutils
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.5.1.tar.gz mirror://debian/pool/main/s/sysklogd/sysklogd_1.5-6.diff.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3cdb691655edcd83ab25a932a8ce88e1
diff --git a/metadata/md5-cache/app-admin/sysklogd-1.5.1-r1 b/metadata/md5-cache/app-admin/sysklogd-1.5.1-r1
index c1f309caae4b..f30a30c298c1 100644
--- a/metadata/md5-cache/app-admin/sysklogd-1.5.1-r1
+++ b/metadata/md5-cache/app-admin/sysklogd-1.5.1-r1
@@ -3,11 +3,11 @@ DESCRIPTION=Standard log daemons
 EAPI=5
 HOMEPAGE=http://www.infodrom.org/projects/sysklogd/
 IUSE=logrotate
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=dev-lang/perl sys-apps/debianutils
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.5.1.tar.gz mirror://debian/pool/main/s/sysklogd/sysklogd_1.5-6.diff.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=22295e92d4fba89e5c5d106a8db4a463
+_md5_=25723fb68feec118c55212f16a77c29b
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 98a0999fc464..eae373f85f5b 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/xarchiver-0.5.4.12 b/metadata/md5-cache/app-arch/xarchiver-0.5.4.12
index 28d1cb135654..153c15504add 100644
--- a/metadata/md5-cache/app-arch/xarchiver-0.5.4.12
+++ b/metadata/md5-cache/app-arch/xarchiver-0.5.4.12
@@ -4,10 +4,10 @@ DESCRIPTION=A GTK+ archive manager that can be used with Thunar
 EAPI=6
 HOMEPAGE=https://github.com/ib/xarchiver
 IUSE=doc
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2:= x11-libs/gtk+:3=
 SLOT=0
 SRC_URI=https://github.com/ib/xarchiver/archive/0.5.4.12.tar.gz -> xarchiver-0.5.4.12.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f747041915ec21079b07de537a25f870
+_md5_=28dbf4045c9356ee1983e06668a94cd2
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 61e39bce19e6..b09177873ed4 100644
--- a/metadata/md5-cache/app-cdr/Manifest.gz
+++ b/metadata/md5-cache/app-cdr/Manifest.gz
diff --git a/metadata/md5-cache/app-cdr/b5i2iso-0.2 b/metadata/md5-cache/app-cdr/b5i2iso-0.2
deleted file mode 100644
index 8ffad543585f..000000000000
--- a/metadata/md5-cache/app-cdr/b5i2iso-0.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=BlindWrite image to ISO image file converter
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/b5i2iso.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f84d711ccbef4c699fee26636eb1d8c4
diff --git a/metadata/md5-cache/app-cdr/b5i2iso-0.2-r1 b/metadata/md5-cache/app-cdr/b5i2iso-0.2-r1
index fdf42dc66494..14effcd272f4 100644
--- a/metadata/md5-cache/app-cdr/b5i2iso-0.2-r1
+++ b/metadata/md5-cache/app-cdr/b5i2iso-0.2-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Convert CD images from b5i (BlindWrite) to iso
 EAPI=6
 HOMEPAGE=https://web.archive.org/web/20100116120705/b5i2iso.berlios.de
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/b5i2iso.tar.bz2
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5e6baf5b691527cbd2f42e8ca672e456
+_md5_=b2804221fd50de1eb57797d9c6542099
diff --git a/metadata/md5-cache/app-cdr/bchunk-1.2.0-r3 b/metadata/md5-cache/app-cdr/bchunk-1.2.0-r3
deleted file mode 100644
index 6328a635806d..000000000000
--- a/metadata/md5-cache/app-cdr/bchunk-1.2.0-r3
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Convert CD images from bin/cue to iso+wav/cdr
-EAPI=6
-HOMEPAGE=http://he.fi/bchunk/
-KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=http://he.fi/bchunk/bchunk-1.2.0.tar.gz
-_md5_=d378a76ea3ccd7cb31d78b6f06bde5fc
diff --git a/metadata/md5-cache/app-cdr/uif2iso-0.1.7c b/metadata/md5-cache/app-cdr/uif2iso-0.1.7c
deleted file mode 100644
index 5ffb58e75bee..000000000000
--- a/metadata/md5-cache/app-cdr/uif2iso-0.1.7c
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-libs/zlib app-arch/unzip
-DESCRIPTION=Converts MagicISO CD-images to iso
-EAPI=0
-HOMEPAGE=http://aluigi.org/mytoolz.htm#uif2iso
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib
-SLOT=0
-SRC_URI=mirror://gentoo/uif2iso-0.1.7c.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6ed7dcb8bee4973263c8e21429fc8b7c
diff --git a/metadata/md5-cache/app-cdr/uif2iso-0.1.7c-r1 b/metadata/md5-cache/app-cdr/uif2iso-0.1.7c-r1
index 740b33f90716..9944f36c3473 100644
--- a/metadata/md5-cache/app-cdr/uif2iso-0.1.7c-r1
+++ b/metadata/md5-cache/app-cdr/uif2iso-0.1.7c-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Convert CD images from uif (MagicISO) to iso
 EAPI=6
 HOMEPAGE=http://aluigi.altervista.org/mytoolz.htm#uif2iso
 IUSE=test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-2+
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=mirror://gentoo/uif2iso-0.1.7c.zip test? ( https://yegortimoshenko.s3.amazonaws.com/uif2iso-test.iso https://yegortimoshenko.s3.amazonaws.com/uif2iso-test.uif )
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=edeab90569cb9f3d2847199c4dcab99c
+_md5_=b0cf5e275bacabc3afbca4092681efa4
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index d1f80904b2df..37fee4835896 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.10.0 b/metadata/md5-cache/app-crypt/gpgme-1.10.0
index 7c1b13628c0c..a54e617d84b0 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.10.0
+++ b/metadata/md5-cache/app-crypt/gpgme-1.10.0
@@ -4,11 +4,11 @@ DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use
 EAPI=6
 HOMEPAGE=http://www.gnupg.org/related_software/gpgme
 IUSE=common-lisp static-libs cxx python qt5 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.0.2:= >=dev-libs/libgpg-error-1.17:= python? ( 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-qt/qtcore:5 ) cxx? ( !<kde-apps/gpgmepp-4.14.11_pre20160611:4 !kde-apps/gpgmepp:5 !<kde-apps/kdepimlibs-4.14.10_p20160611:4 !=kde-apps/kdepimlibs-4.14.11_pre20160211*:4 )
 REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=1/11
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.10.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=444462dc66df864bbcc9bfdfde8d1877
+_md5_=ae284388d40e244921cebc444c96e753
diff --git a/metadata/md5-cache/app-crypt/tinyca-2.0.7.5-r3 b/metadata/md5-cache/app-crypt/tinyca-2.0.7.5-r3
index 0d41c475916b..81798852fcf2 100644
--- a/metadata/md5-cache/app-crypt/tinyca-2.0.7.5-r3
+++ b/metadata/md5-cache/app-crypt/tinyca-2.0.7.5-r3
@@ -3,11 +3,11 @@ DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev
 DESCRIPTION=Simple Perl/Tk GUI to manage a small certification authority
 EAPI=6
 HOMEPAGE=https://opsec.eu/src/tinyca/
-IUSE=libressl linguas_en linguas_de linguas_cs linguas_es linguas_sv
+IUSE=libressl
 KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=Artistic
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-perl/Locale-gettext >=virtual/perl-MIME-Base64-2.12 >=dev-perl/Gtk2-1.072
 SLOT=0
 SRC_URI=http://tinyca.sm-zone.net/tinyca2-0.7.5.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4b7c518cf00c992a2f61c2182ca6e275
+_md5_=091a419657eb282a1f36ee5fffa9a992
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 2a61abfb4ec6..d64a3709205a 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/gvim-8.0.1298 b/metadata/md5-cache/app-editors/gvim-8.0.1298
index 6f5803bb92b4..56f0f24c7853 100644
--- a/metadata/md5-cache/app-editors/gvim-8.0.1298
+++ b/metadata/md5-cache/app-editors/gvim-8.0.1298
@@ -4,11 +4,11 @@ DESCRIPTION=GUI version of the Vim text editor
 EAPI=6
 HOMEPAGE=https://vim.sourceforge.io/ https://github.com/vim/vim
 IUSE=acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
 LICENSE=vim
 RDEPEND=~app-editors/vim-core-8.0.1298 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( gtk3? ( x11-libs/gtk+:3 x11-libs/libXft ) !gtk3? ( gtk? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft gnome? ( >=gnome-base/libgnomeui-2.6 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( x11-libs/libXaw ) ) ) ) ) cscope? ( dev-util/cscope ) lua? ( luajit? ( dev-lang/luajit:2= ) !luajit? ( dev-lang/lua:0[deprecated] ) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= )
 REQUIRED_USE=luajit? ( lua ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.0.1298.tar.gz -> vim-8.0.1298.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7e720aa7fa2bd560bd219bb34073f667
+_md5_=47a193a1c96df25ab942a1970388f45f
diff --git a/metadata/md5-cache/app-editors/nano-2.8.7 b/metadata/md5-cache/app-editors/nano-2.8.7
index 79690e5afcfc..49f323411fac 100644
--- a/metadata/md5-cache/app-editors/nano-2.8.7
+++ b/metadata/md5-cache/app-editors/nano-2.8.7
@@ -4,10 +4,10 @@ DESCRIPTION=GNU GPL'd Pico clone with more functionality
 EAPI=6
 HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
 IUSE=debug justify +magic minimal ncurses nls slang +spell static unicode
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0= magic? ( sys-apps/file ) nls? ( virtual/libintl ) !ncurses? ( slang? ( sys-libs/slang ) ) )
 SLOT=0
 SRC_URI=https://www.nano-editor.org/dist/v2.8/nano-2.8.7.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3573ab0d3a23e4f64d6049d994887280
+_md5_=8b9bb5363cf2e4405c5a43bf69f5a7de
diff --git a/metadata/md5-cache/app-editors/neovim-0.2.0 b/metadata/md5-cache/app-editors/neovim-0.2.0
deleted file mode 100644
index eb0e8a7b8aa9..000000000000
--- a/metadata/md5-cache/app-editors/neovim-0.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( >=dev-libs/libtermkey-0.19 >=dev-libs/unibilium-1.1.1 ) dev-libs/libvterm dev-lua/lpeg[luajit=] dev-lua/mpack[luajit=] jemalloc? ( dev-libs/jemalloc ) dev-util/gperf virtual/libiconv virtual/libintl sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Vim-fork focused on extensibility and agility.
-EAPI=6
-HOMEPAGE=https://neovim.io
-IUSE=+clipboard +luajit +nvimpager python ruby +tui +jemalloc
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 vim
-RDEPEND=>=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( >=dev-libs/libtermkey-0.19 >=dev-libs/unibilium-1.1.1 ) dev-libs/libvterm dev-lua/lpeg[luajit=] dev-lua/mpack[luajit=] jemalloc? ( dev-libs/jemalloc ) python? ( dev-python/neovim-python-client ) ruby? ( dev-ruby/neovim-ruby-client ) clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )
-SLOT=0
-SRC_URI=https://github.com/neovim/neovim/archive/v0.2.0.tar.gz -> neovim-0.2.0.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=97820ce074a97f6abb7aa1080bde9940
diff --git a/metadata/md5-cache/app-editors/neovim-0.2.0-r1 b/metadata/md5-cache/app-editors/neovim-0.2.0-r1
index 374aa9edf79c..37150a40fbd5 100644
--- a/metadata/md5-cache/app-editors/neovim-0.2.0-r1
+++ b/metadata/md5-cache/app-editors/neovim-0.2.0-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 luajit? ( dev-lang/luaji
 SLOT=0
 SRC_URI=https://github.com/neovim/neovim/archive/v0.2.0.tar.gz -> neovim-0.2.0.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5c5295ccef6e05ced5ff196bd86debea
+_md5_=3b9bd5dd524e34ba0bb2a01e03762b4c
diff --git a/metadata/md5-cache/app-editors/neovim-0.2.2 b/metadata/md5-cache/app-editors/neovim-0.2.2
deleted file mode 100644
index 3f172438b70f..000000000000
--- a/metadata/md5-cache/app-editors/neovim-0.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( >=dev-libs/libtermkey-0.19 >=dev-libs/unibilium-1.1.1 ) dev-libs/libvterm dev-lua/lpeg[luajit=] dev-lua/mpack[luajit=] jemalloc? ( dev-libs/jemalloc ) dev-util/gperf virtual/libiconv virtual/libintl sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Vim-fork focused on extensibility and agility.
-EAPI=6
-HOMEPAGE=https://neovim.io
-IUSE=+clipboard +luajit +nvimpager python ruby +tui +jemalloc
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0 vim
-RDEPEND=>=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( >=dev-libs/libtermkey-0.19 >=dev-libs/unibilium-1.1.1 ) dev-libs/libvterm dev-lua/lpeg[luajit=] dev-lua/mpack[luajit=] jemalloc? ( dev-libs/jemalloc ) python? ( dev-python/neovim-python-client ) ruby? ( dev-ruby/neovim-ruby-client ) clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )
-SLOT=0
-SRC_URI=https://github.com/neovim/neovim/archive/v0.2.2.tar.gz -> neovim-0.2.2.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=97820ce074a97f6abb7aa1080bde9940
diff --git a/metadata/md5-cache/app-editors/neovim-0.2.2-r1 b/metadata/md5-cache/app-editors/neovim-0.2.2-r1
index e0527785862d..e981052f7e6d 100644
--- a/metadata/md5-cache/app-editors/neovim-0.2.2-r1
+++ b/metadata/md5-cache/app-editors/neovim-0.2.2-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 luajit? ( dev-lang/luaji
 SLOT=0
 SRC_URI=https://github.com/neovim/neovim/archive/v0.2.2.tar.gz -> neovim-0.2.2.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5c5295ccef6e05ced5ff196bd86debea
+_md5_=3b9bd5dd524e34ba0bb2a01e03762b4c
diff --git a/metadata/md5-cache/app-editors/neovim-9999 b/metadata/md5-cache/app-editors/neovim-9999
index 5663b1433dde..58b90d311b59 100644
--- a/metadata/md5-cache/app-editors/neovim-9999
+++ b/metadata/md5-cache/app-editors/neovim-9999
@@ -8,4 +8,4 @@ LICENSE=Apache-2.0 vim
 RDEPEND=>=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-1.0.0 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:= dev-lua/LuaBitOp ) tui? ( >=dev-libs/libtermkey-0.19 >=dev-libs/unibilium-1.1.1 ) dev-libs/libvterm dev-lua/lpeg[luajit=] dev-lua/mpack[luajit=] jemalloc? ( dev-libs/jemalloc ) python? ( dev-python/neovim-python-client ) ruby? ( dev-ruby/neovim-ruby-client ) remote? ( dev-python/neovim-remote ) clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )
 SLOT=0
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5c5295ccef6e05ced5ff196bd86debea
+_md5_=3b9bd5dd524e34ba0bb2a01e03762b4c
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index e5f0909f2498..732ccac29097 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/playonlinux-4.2.12 b/metadata/md5-cache/app-emulation/playonlinux-4.2.12
index 44b3c48c89ee..7c773083e952 100644
--- a/metadata/md5-cache/app-emulation/playonlinux-4.2.12
+++ b/metadata/md5-cache/app-emulation/playonlinux-4.2.12
@@ -6,9 +6,9 @@ HOMEPAGE=https://playonlinux.com/
 IUSE=winbind python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-arch/cabextract app-arch/p7zip app-arch/unzip app-crypt/gnupg || ( virtual/wine app-emulation/wine ) dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] net-misc/wget x11-apps/mesa-progs x11-terms/xterm media-gfx/icoutils || ( net-analyzer/netcat net-analyzer/netcat6 ) virtual/imagemagick-tools winbind? ( net-fs/samba[winbind] )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-arch/cabextract app-arch/p7zip app-arch/unzip app-crypt/gnupg virtual/wine dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] net-misc/wget x11-apps/mesa-progs x11-terms/xterm media-gfx/icoutils || ( net-analyzer/netcat net-analyzer/netcat6 ) virtual/imagemagick-tools winbind? ( net-fs/samba[winbind] )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://www.playonlinux.com/script_files/PlayOnLinux/4.2.12/PlayOnLinux_4.2.12.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1fe63f78a5fe2fbad58f8fceb0b9323b
+_md5_=51e1c41f2f33877085af95c01d3b112c
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index a3b63e6e4151..8622c19470a5 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/emelfm2-0.9.1-r1 b/metadata/md5-cache/app-misc/emelfm2-0.9.1-r1
index 367d9803eadc..c83c6f37e9d5 100644
--- a/metadata/md5-cache/app-misc/emelfm2-0.9.1-r1
+++ b/metadata/md5-cache/app-misc/emelfm2-0.9.1-r1
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/glib-2.26:2 !gtk3? ( >=x11-libs/gtk+-2.12:2 ) gtk3? ( x11-libs
 DESCRIPTION=A file manager that implements the popular two-pane design
 EAPI=5
 HOMEPAGE=http://emelfm2.net/
-IUSE=acl ansi gimp gtk3 kernel_linux nls policykit spell udisks linguas_de linguas_fr linguas_ja linguas_pl linguas_ru linguas_zh_CN
+IUSE=acl ansi gimp gtk3 kernel_linux nls policykit spell udisks
 KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/glib-2.26:2 !gtk3? ( >=x11-libs/gtk+-2.12:2 ) gtk3? ( x11-libs/gtk+:3 ) acl? ( sys-apps/acl ) gimp? ( media-gfx/gimp ) policykit? ( sys-auth/polkit ) spell? ( >=app-text/gtkspell-2.0.14:2 ) udisks? ( sys-fs/udisks:2 )
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://emelfm2.net/rel/emelfm2-0.9.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e75a22244bb970fc2f81601fa717b068
+_md5_=7430063d83125200a840b7834c6f683c
diff --git a/metadata/md5-cache/app-misc/emelfm2-0.9.1-r2 b/metadata/md5-cache/app-misc/emelfm2-0.9.1-r2
index e122163bf8c3..451ff3441c74 100644
--- a/metadata/md5-cache/app-misc/emelfm2-0.9.1-r2
+++ b/metadata/md5-cache/app-misc/emelfm2-0.9.1-r2
@@ -3,7 +3,7 @@ DEPEND=>=dev-libs/glib-2.26:2 !gtk3? ( >=x11-libs/gtk+-2.12:2 ) gtk3? ( x11-libs
 DESCRIPTION=A file manager that implements the popular two-pane design
 EAPI=5
 HOMEPAGE=http://emelfm2.net/
-IUSE=acl ansi gimp gtk3 kernel_linux nls policykit spell udisks linguas_de linguas_fr linguas_ja linguas_pl linguas_ru linguas_zh_CN
+IUSE=acl ansi gimp gtk3 kernel_linux nls policykit spell udisks
 KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/glib-2.26:2 !gtk3? ( >=x11-libs/gtk+-2.12:2 ) gtk3? ( x11-libs/gtk+:3 ) acl? ( sys-apps/acl ) gimp? ( media-gfx/gimp ) policykit? ( sys-auth/polkit ) spell? ( >=app-text/gtkspell-2.0.14:2 ) udisks? ( sys-fs/udisks:2 )
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://emelfm2.net/rel/emelfm2-0.9.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1beebb3296170fcc6247c112bdb8fe14
+_md5_=c09f96cc6c5cc294458d6e232781f8a6
diff --git a/metadata/md5-cache/app-mobilephone/Manifest.gz b/metadata/md5-cache/app-mobilephone/Manifest.gz
index aeaa8e65e9ff..b5e1b78bbb07 100644
--- a/metadata/md5-cache/app-mobilephone/Manifest.gz
+++ b/metadata/md5-cache/app-mobilephone/Manifest.gz
diff --git a/metadata/md5-cache/app-mobilephone/gammu-1.33.0-r1 b/metadata/md5-cache/app-mobilephone/gammu-1.33.0-r1
index 08bb6e9d2a5b..2a503580e5fa 100644
--- a/metadata/md5-cache/app-mobilephone/gammu-1.33.0-r1
+++ b/metadata/md5-cache/app-mobilephone/gammu-1.33.0-r1
@@ -3,7 +3,7 @@ DEPEND=dev-libs/glib:2= virtual/libgudev:= bluetooth? ( net-wireless/bluez:= ) c
 DESCRIPTION=A tool to handle your cellular phone
 EAPI=5
 HOMEPAGE=https://wammu.eu/gammu/
-IUSE=bluetooth curl dbi debug irda mysql nls postgres python usb linguas_af linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_he linguas_hu linguas_id linguas_it linguas_ko linguas_nl linguas_pl linguas_pt_BR linguas_ru linguas_sk linguas_sv linguas_sw linguas_tr linguas_zh_CN linguas_zh_TW python_targets_python2_7
+IUSE=bluetooth curl dbi debug irda mysql nls postgres python usb python_targets_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2= virtual/libgudev:= bluetooth? ( net-wireless/bluez:= ) curl? ( net-misc/curl:= ) dbi? ( >=dev-db/libdbi-0.8.3:= ) mysql? ( virtual/mysql:= ) postgres? ( dev-db/postgresql:=[server] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) usb? ( virtual/libusb:1= ) dev-util/dialog
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://dl.cihar.com/gammu/releases/gammu-1.33.0.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2ab928df949980a9260f7160e2ff902c
+_md5_=17e7841e38a4b0866c2b4369920f2de2
diff --git a/metadata/md5-cache/app-mobilephone/gammu-1.36.8 b/metadata/md5-cache/app-mobilephone/gammu-1.36.8
index b20704a625d8..2b6a3fbc0657 100644
--- a/metadata/md5-cache/app-mobilephone/gammu-1.36.8
+++ b/metadata/md5-cache/app-mobilephone/gammu-1.36.8
@@ -3,11 +3,11 @@ DEPEND=dev-libs/glib:2= virtual/libgudev:= bluetooth? ( net-wireless/bluez:= ) c
 DESCRIPTION=A tool to handle your cellular phone
 EAPI=5
 HOMEPAGE=https://wammu.eu/gammu/
-IUSE=bluetooth curl dbi debug irda mysql nls postgres usb linguas_af linguas_ar linguas_bg linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_he linguas_hu linguas_id linguas_it linguas_ko linguas_nl linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_sw linguas_tr linguas_zh_CN linguas_zh_TW
+IUSE=bluetooth curl dbi debug irda mysql nls postgres usb
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2= virtual/libgudev:= bluetooth? ( net-wireless/bluez:= ) curl? ( net-misc/curl:= ) dbi? ( >=dev-db/libdbi-0.8.3:= ) mysql? ( virtual/mysql:= ) postgres? ( dev-db/postgresql:= ) usb? ( virtual/libusb:1= ) dev-util/dialog
 SLOT=0
 SRC_URI=http://dl.cihar.com/gammu/releases/gammu-1.36.8.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9aba31563d0bebff74af517a6e6836f4
+_md5_=6081b3be6e1c3cca8769ee8a67bd6950
diff --git a/metadata/md5-cache/app-mobilephone/wammu-0.40 b/metadata/md5-cache/app-mobilephone/wammu-0.40
index ad27dcd33a16..ecd94fca2b13 100644
--- a/metadata/md5-cache/app-mobilephone/wammu-0.40
+++ b/metadata/md5-cache/app-mobilephone/wammu-0.40
@@ -3,7 +3,7 @@ DEPEND=|| ( ( >=app-mobilephone/gammu-1.36 dev-python/python-gammu ) >=app-mobil
 DESCRIPTION=Front-end for gammu to access mobile phones easily
 EAPI=5
 HOMEPAGE=http://www.wammu.eu/
-IUSE=bluetooth gnome linguas_af linguas_ar linguas_bg linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_he linguas_hu linguas_id linguas_it linguas_ko linguas_nl linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_sw linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW python_targets_python2_7
+IUSE=bluetooth gnome python_targets_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=|| ( ( >=app-mobilephone/gammu-1.36 dev-python/python-gammu ) >=app-mobilephone/gammu-1.25.0[python] ) >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] bluetooth? ( dev-python/pybluez[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome? ( net-wireless/gnome-bluetooth ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://dl.cihar.com/wammu/v0/wammu-0.40.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1b4897e33cb9b7b399712c9e2bf75a37
+_md5_=95c24879d40f0d74ae4cbb16e45aceef
diff --git a/metadata/md5-cache/app-mobilephone/wammu-0.43 b/metadata/md5-cache/app-mobilephone/wammu-0.43
index 2e03808396fe..16ae8d0c9a83 100644
--- a/metadata/md5-cache/app-mobilephone/wammu-0.43
+++ b/metadata/md5-cache/app-mobilephone/wammu-0.43
@@ -3,7 +3,7 @@ DEPEND=>=app-mobilephone/gammu-1.36 dev-python/python-gammu >=dev-python/wxpytho
 DESCRIPTION=Front-end for gammu to access mobile phones easily
 EAPI=6
 HOMEPAGE=http://www.wammu.eu/
-IUSE=bluetooth gnome linguas_af linguas_ar linguas_bg linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_et linguas_fi linguas_fr linguas_gl linguas_he linguas_hu linguas_id linguas_it linguas_ko linguas_nl linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_sw linguas_tr linguas_uk linguas_zh_CN linguas_zh_TW python_targets_python2_7
+IUSE=bluetooth gnome python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=app-mobilephone/gammu-1.36 dev-python/python-gammu >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] bluetooth? ( dev-python/pybluez[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome? ( net-wireless/gnome-bluetooth ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://dl.cihar.com/wammu/v0/wammu-0.43.tar.xz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7988ee85b0f18a3fe4f90d023acdf3b6
+_md5_=29d2e5a448d5a24fc02c4482fff6f1d0
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index dd309e91291f..36fe3aa10291 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/libreoffice-5.4.9999 b/metadata/md5-cache/app-office/libreoffice-5.4.9999
index 968b475403be..e96deae34f7c 100644
--- a/metadata/md5-cache/app-office/libreoffice-5.4.9999
+++ b/metadata/md5-cache/app-office/libreoffice-5.4.9999
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) collada? ( https://dev-www.libreoffice.org/src//4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=165930450ee9ab9e59f267e414cd3c00
+_md5_=eb703b6d28c1d99b73aecc51d70f3a32
diff --git a/metadata/md5-cache/app-office/libreoffice-6.0.9999 b/metadata/md5-cache/app-office/libreoffice-6.0.9999
index 461eb9166544..88be6f939789 100644
--- a/metadata/md5-cache/app-office/libreoffice-6.0.9999
+++ b/metadata/md5-cache/app-office/libreoffice-6.0.9999
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3605968b08b388b98350120d41c3be83
+_md5_=96df3cd760047c4ba213faf79ff91347
diff --git a/metadata/md5-cache/app-office/libreoffice-9999 b/metadata/md5-cache/app-office/libreoffice-9999
index 35c901e3d675..f712b004f6b5 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999
+++ b/metadata/md5-cache/app-office/libreoffice-9999
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4
 SLOT=0
 SRC_URI=branding? ( https://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.8.tar.xz ) java? ( https://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) libreoffice_extensions_wiki-publisher? ( https://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) libreoffice_extensions_scripting-javascript? ( https://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=540e7e883b6f2e48b1beeefa083b8f2c
+_md5_=5b2929428fbfee5eca4f0cbeb2dbe6ad
diff --git a/metadata/md5-cache/app-office/orage-4.12.1-r1 b/metadata/md5-cache/app-office/orage-4.12.1-r1
index dc7b305bea72..79b8eeb321c1 100644
--- a/metadata/md5-cache/app-office/orage-4.12.1-r1
+++ b/metadata/md5-cache/app-office/orage-4.12.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A time managing application (and panel plug-in) for the Xfce desktop
 EAPI=6
 HOMEPAGE=https://git.xfce.org/apps/orage/
 IUSE=berkdb +clock-panel-plugin dbus libnotify
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libical-0.48:= dev-libs/popt:= >=x11-libs/gtk+-2.10:2= berkdb? ( >=sys-libs/db-4:= ) clock-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) dbus? ( >=dev-libs/dbus-glib-0.100:= ) libnotify? ( >=x11-libs/libnotify-0.7:= )
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/orage/4.12/orage-4.12.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=69fe5e5f3e8f4d80baddcb3af4cb7f9c
+_md5_=80266c8e38d1059c24a0d5f00f0bc9eb
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 7985b56f684a..5b698692b860 100644
--- a/metadata/md5-cache/app-shells/Manifest.gz
+++ b/metadata/md5-cache/app-shells/Manifest.gz
diff --git a/metadata/md5-cache/app-shells/mksh-53a b/metadata/md5-cache/app-shells/mksh-53a
index 520805b71611..91275f8d3174 100644
--- a/metadata/md5-cache/app-shells/mksh-53a
+++ b/metadata/md5-cache/app-shells/mksh-53a
@@ -4,9 +4,9 @@ DESCRIPTION=MirBSD KSH Shell
 EAPI=5
 HOMEPAGE=http://mirbsd.de/mksh
 IUSE=static
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R53a.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ef0b22205e1a51e5a9437bbf0d1d8c69
+_md5_=f11856f7aceb91ac42edb646b16db0e7
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index c28ec057e002..f23c2cc8a043 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/calibre-3.15.0 b/metadata/md5-cache/app-text/calibre-3.15.0
new file mode 100644
index 000000000000..5f0625d0958c
--- /dev/null
+++ b/metadata/md5-cache/app-text/calibre-3.15.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-text/podofo-0.8.2:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.13.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/chardet[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/cssutils-1.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/html5-parser[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.2.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/msgpack[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.1.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 sys-libs/zlib:= virtual/libusb:1= virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) >=dev-python/setuptools-23.1.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=virtual/podofo-build-0.9.4 virtual/pkgconfig
+DESCRIPTION=Ebook management application
+EAPI=6
+HOMEPAGE=http://calibre-ebook.com/
+IUSE=ios +udisks python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2 unRAR
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-text/podofo-0.8.2:= >=app-text/poppler-0.26.5[qt5] >=dev-libs/chmlib-0.40:= dev-libs/glib:2= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.13.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/chardet[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/cssutils-1.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/html5-parser[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.2.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/msgpack[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.1.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5= dev-qt/qtwidgets:5= media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 sys-libs/zlib:= virtual/libusb:1= virtual/python-dnspython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://download.calibre-ebook.com/3.15.0/calibre-3.15.0.tar.xz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=9e57a310e74dd718f6de8a57d51193a1
diff --git a/metadata/md5-cache/app-text/diffpdf-2.1.3 b/metadata/md5-cache/app-text/diffpdf-2.1.3
deleted file mode 100644
index f5a17b1fc505..000000000000
--- a/metadata/md5-cache/app-text/diffpdf-2.1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=app-text/poppler:=[qt4] >=dev-qt/qtcore-4.6:4 >=dev-qt/qtgui-4.6:4
-DESCRIPTION=Program that textually or visually compares two PDF files
-EAPI=5
-HOMEPAGE=http://www.qtrac.eu/diffpdf.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-text/poppler:=[qt4] >=dev-qt/qtcore-4.6:4 >=dev-qt/qtgui-4.6:4
-SLOT=0
-SRC_URI=http://www.qtrac.eu/diffpdf-2.1.3.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b4b0a2b19a4a29a414736323ea4d796a
diff --git a/metadata/md5-cache/app-text/diffpdf-2.1.3-r1 b/metadata/md5-cache/app-text/diffpdf-2.1.3-r1
new file mode 100644
index 000000000000..d10f24cf733c
--- /dev/null
+++ b/metadata/md5-cache/app-text/diffpdf-2.1.3-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=app-text/poppler:=[qt5] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/linguist-tools:5
+DESCRIPTION=Program that textually or visually compares two PDF files
+EAPI=6
+HOMEPAGE=http://www.qtrac.eu/diffpdf.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/poppler:=[qt5] dev-qt/qtcore:5 dev-qt/qtgui:5
+SLOT=0
+SRC_URI=http://www.qtrac.eu/diffpdf-2.1.3.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=e746ab398e162a56c8fa70db8068d130
diff --git a/metadata/md5-cache/app-text/krop-0.4.13 b/metadata/md5-cache/app-text/krop-0.4.13
deleted file mode 100644
index 399017ef36c0..000000000000
--- a/metadata/md5-cache/app-text/krop-0.4.13
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A tool to crop PDF files
-EAPI=6
-HOMEPAGE=http://arminstraub.com/software/krop
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/python-poppler-qt4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyPDF2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=http://arminstraub.com/downloads/krop/krop-0.4.13.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0e5b8c50fab31202dd5e6059d4bfe657
diff --git a/metadata/md5-cache/app-text/krop-0.4.13.5 b/metadata/md5-cache/app-text/krop-0.4.13.5
index c98564bddcfb..261642bc2914 100644
--- a/metadata/md5-cache/app-text/krop-0.4.13.5
+++ b/metadata/md5-cache/app-text/krop-0.4.13.5
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install prepare test
+DEFINED_PHASES=compile configure install postinst postrm prepare test
 DEPEND=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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=A tool to crop PDF files
 EAPI=6
@@ -9,6 +9,6 @@ LICENSE=GPL-3
 RDEPEND=dev-python/python-poppler-qt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyPDF2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~huettel/distfiles/krop-0.4.13.5.tar.gz
+SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/krop-0.4.13.5.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=302a889ab91523c3e39ee71b507227cc
+_md5_=13fa8abc2c94ce29bbe0626a9ceed2d3
diff --git a/metadata/md5-cache/app-text/libabw-0.1.2 b/metadata/md5-cache/app-text/libabw-0.1.2
new file mode 100644
index 000000000000..9d9cc7ef5514
--- /dev/null
+++ b/metadata/md5-cache/app-text/libabw-0.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib >=dev-libs/boost-1.46 sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<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=Library parsing abiword documents
+EAPI=6
+HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libabw
+IUSE=doc static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
+SLOT=0
+SRC_URI=https://dev-www.libreoffice.org/src/libabw/libabw-0.1.2.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=466924d66edee83275a339ec485e5635
diff --git a/metadata/md5-cache/app-text/libebook-0.1.3 b/metadata/md5-cache/app-text/libebook-0.1.3
new file mode 100644
index 000000000000..21ad0bb93017
--- /dev/null
+++ b/metadata/md5-cache/app-text/libebook-0.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=app-text/liblangtag dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib dev-libs/boost dev-util/gperf virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) >=app-portage/elt-patches-20170422 !<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=Library parsing various ebook formats
+EAPI=6
+HOMEPAGE=http://www.sourceforge.net/projects/libebook/
+IUSE=doc test tools
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=app-text/liblangtag dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
+SLOT=0
+SRC_URI=mirror://sourceforge/libebook/libe-book-0.1.3.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=a113353fa2383e50c7ae8951438b5412
diff --git a/metadata/md5-cache/app-text/libmspub-0.1.3 b/metadata/md5-cache/app-text/libmspub-0.1.3
new file mode 100644
index 000000000000..d0b22793bbe5
--- /dev/null
+++ b/metadata/md5-cache/app-text/libmspub-0.1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/icu:= dev-libs/librevenge sys-libs/zlib dev-libs/boost sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen )
+DESCRIPTION=Library parsing Microsoft Publisher documents
+EAPI=6
+HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libmspub
+IUSE=doc static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/icu:= dev-libs/librevenge sys-libs/zlib
+SLOT=0
+SRC_URI=https://dev-www.libreoffice.org/src/libmspub/libmspub-0.1.3.tar.xz
+_md5_=346897a9fe3fb03e929568b38aee72cb
diff --git a/metadata/md5-cache/app-text/libmspub-9999 b/metadata/md5-cache/app-text/libmspub-9999
index 3d9bec7b8059..0076e648c025 100644
--- a/metadata/md5-cache/app-text/libmspub-9999
+++ b/metadata/md5-cache/app-text/libmspub-9999
@@ -8,4 +8,4 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/icu:= dev-libs/librevenge sys-libs/zlib
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1ef8a0a170b117d0ff832fafe5b4a246
+_md5_=346897a9fe3fb03e929568b38aee72cb
diff --git a/metadata/md5-cache/app-text/libqxp-0.0.1 b/metadata/md5-cache/app-text/libqxp-0.0.1
new file mode 100644
index 000000000000..4762d5f1c919
--- /dev/null
+++ b/metadata/md5-cache/app-text/libqxp-0.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/librevenge dev-libs/icu:= dev-libs/boost virtual/pkgconfig doc? ( app-doc/doxygen )
+DESCRIPTION=Library parsing QuarkXpress documents
+EAPI=6
+HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libqxp
+IUSE=debug doc test tools
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=dev-libs/librevenge dev-libs/icu:=
+SLOT=0
+SRC_URI=https://dev-www.libreoffice.org/src/libqxp/libqxp-0.0.1.tar.xz
+_md5_=722ee9c721ea4688ed112646cb64e865
diff --git a/metadata/md5-cache/app-text/poppler-0.62.0 b/metadata/md5-cache/app-text/poppler-0.62.0-r1
index 71c27abeb03c..7bdac8e8827d 100644
--- a/metadata/md5-cache/app-text/poppler-0.62.0
+++ b/metadata/md5-cache/app-text/poppler-0.62.0-r1
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 LICENSE=GPL-2
 RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( >=app-text/poppler-data-0.4.7 )
 RESTRICT=test
-SLOT=0/72
+SLOT=0/73
 SRC_URI=https://poppler.freedesktop.org/poppler-0.62.0.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=151c13166fb7e7008a7cbf6ae30b6cb7
+_md5_=43ea141a2ba9be18318ff007bc7edd72
diff --git a/metadata/md5-cache/app-text/t1utils-1.41-r2 b/metadata/md5-cache/app-text/t1utils-1.41-r2
new file mode 100644
index 000000000000..9d73d967e330
--- /dev/null
+++ b/metadata/md5-cache/app-text/t1utils-1.41-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=>=app-portage/elt-patches-20170422 !<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=Type 1 Font utilities
+EAPI=6
+HOMEPAGE=http://www.lcdf.org/type/#t1utils
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=!<media-libs/freetype-1.4_pre20080316
+SLOT=0
+SRC_URI=http://www.lcdf.org/type/t1utils-1.41.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=1574f626a56cacf24dbfd6a7414726cc
diff --git a/metadata/md5-cache/app-text/texlive-core-2016-r6 b/metadata/md5-cache/app-text/texlive-core-2016-r6
new file mode 100644
index 000000000000..7cc458a2e173
--- /dev/null
+++ b/metadata/md5-cache/app-text/texlive-core-2016-r6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare unpack
+DEPEND=X? ( x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXaw ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2014 !<dev-texlive/texlive-metapost-2011 !app-text/dvibook !dev-tex/luatex !app-text/dvipdfm !app-text/dvipdfmx !app-text/xdvipdfmx sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= >=app-text/poppler-0.12.3-r3:= >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0 xetex? ( >=media-libs/harfbuzz-0.9.20[icu,graphite] >=dev-libs/icu-50:= >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/kpathsea-6.2.1 cjk? ( >=dev-libs/ptexenc-1.3.4_p20160523 ) virtual/pkgconfig sys-apps/ed sys-devel/flex app-arch/xz-utils >=app-portage/elt-patches-20170422
+DESCRIPTION=A complete TeX distribution
+EAPI=5
+HOMEPAGE=http://tug.org/texlive/
+IUSE=cjk X doc source tk +luajittex xetex
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LPPL-1.3c TeX
+RDEPEND=X? ( x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXaw ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2014 !<dev-texlive/texlive-metapost-2011 !app-text/dvibook !dev-tex/luatex !app-text/dvipdfm !app-text/dvipdfmx !app-text/xdvipdfmx sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= >=app-text/poppler-0.12.3-r3:= >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0 xetex? ( >=media-libs/harfbuzz-0.9.20[icu,graphite] >=dev-libs/icu-50:= >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/kpathsea-6.2.1 cjk? ( >=dev-libs/ptexenc-1.3.4_p20160523 ) >=app-text/ps2pkm-1.8_p20160523 >=app-text/dvipsk-5.996_p20160523 >=dev-tex/bibtexu-3.71_p20160523 virtual/perl-Getopt-Long tk? ( dev-perl/Tk )
+SLOT=0
+SRC_URI=mirror://gentoo/texlive-20160523-source.tar.xz mirror://gentoo/texlive-core-patches-65.1.tar.xz mirror://gentoo/texlive-module-tetex-2016.tar.xz mirror://gentoo/texlive-module-hyphen-base-2016.tar.xz mirror://gentoo/texlive-module-texconfig-2016.tar.xz mirror://gentoo/texlive-module-gsftopk-2016.tar.xz mirror://gentoo/texlive-module-texlive.infra-2016.tar.xz mirror://gentoo/texlive-module-a2ping-2016.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2016.tar.xz mirror://gentoo/texlive-module-arara-2016.tar.xz mirror://gentoo/texlive-module-asymptote-2016.tar.xz mirror://gentoo/texlive-module-bundledoc-2016.tar.xz mirror://gentoo/texlive-module-checklistings-2016.tar.xz mirror://gentoo/texlive-module-ctan_chk-2016.tar.xz mirror://gentoo/texlive-module-ctanify-2016.tar.xz mirror://gentoo/texlive-module-ctanupload-2016.tar.xz mirror://gentoo/texlive-module-ctie-2016.tar.xz mirror://gentoo/texlive-module-cweb-2016.tar.xz mirror://gentoo/texlive-module-de-macro-2016.tar.xz mirror://gentoo/texlive-module-dtl-2016.tar.xz mirror://gentoo/texlive-module-dtxgen-2016.tar.xz mirror://gentoo/texlive-module-dvi2tty-2016.tar.xz mirror://gentoo/texlive-module-dviasm-2016.tar.xz mirror://gentoo/texlive-module-dvicopy-2016.tar.xz mirror://gentoo/texlive-module-dvidvi-2016.tar.xz mirror://gentoo/texlive-module-dviljk-2016.tar.xz mirror://gentoo/texlive-module-dvipos-2016.tar.xz mirror://gentoo/texlive-module-findhyph-2016.tar.xz mirror://gentoo/texlive-module-fragmaster-2016.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg-2016.tar.xz mirror://gentoo/texlive-module-hyphenex-2016.tar.xz mirror://gentoo/texlive-module-installfont-2016.tar.xz mirror://gentoo/texlive-module-lacheck-2016.tar.xz mirror://gentoo/texlive-module-latex-git-log-2016.tar.xz mirror://gentoo/texlive-module-latex-papersize-2016.tar.xz mirror://gentoo/texlive-module-latex2man-2016.tar.xz mirror://gentoo/texlive-module-latex2nemeth-2016.tar.xz mirror://gentoo/texlive-module-latexfileversion-2016.tar.xz mirror://gentoo/texlive-module-latexpand-2016.tar.xz mirror://gentoo/texlive-module-latexindent-2016.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2016.tar.xz mirror://gentoo/texlive-module-ltximg-2016.tar.xz mirror://gentoo/texlive-module-listings-ext-2016.tar.xz mirror://gentoo/texlive-module-make4ht-2016.tar.xz mirror://gentoo/texlive-module-match_parens-2016.tar.xz mirror://gentoo/texlive-module-mflua-2016.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2016.tar.xz mirror://gentoo/texlive-module-patgen-2016.tar.xz mirror://gentoo/texlive-module-pdfbook2-2016.tar.xz mirror://gentoo/texlive-module-pdfcrop-2016.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale-2016.tar.xz mirror://gentoo/texlive-module-pdftools-2016.tar.xz mirror://gentoo/texlive-module-pdfxup-2016.tar.xz mirror://gentoo/texlive-module-pfarrei-2016.tar.xz mirror://gentoo/texlive-module-pkfix-2016.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2016.tar.xz mirror://gentoo/texlive-module-purifyeps-2016.tar.xz mirror://gentoo/texlive-module-seetexk-2016.tar.xz mirror://gentoo/texlive-module-srcredact-2016.tar.xz mirror://gentoo/texlive-module-sty2dtx-2016.tar.xz mirror://gentoo/texlive-module-synctex-2016.tar.xz mirror://gentoo/texlive-module-tex4ebook-2016.tar.xz mirror://gentoo/texlive-module-texcount-2016.tar.xz mirror://gentoo/texlive-module-texdef-2016.tar.xz mirror://gentoo/texlive-module-texdiff-2016.tar.xz mirror://gentoo/texlive-module-texdirflatten-2016.tar.xz mirror://gentoo/texlive-module-texdoc-2016.tar.xz mirror://gentoo/texlive-module-texfot-2016.tar.xz mirror://gentoo/texlive-module-texliveonfly-2016.tar.xz mirror://gentoo/texlive-module-texloganalyser-2016.tar.xz mirror://gentoo/texlive-module-texosquery-2016.tar.xz mirror://gentoo/texlive-module-texware-2016.tar.xz mirror://gentoo/texlive-module-tie-2016.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2016.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2016.tar.xz mirror://gentoo/texlive-module-web-2016.tar.xz mirror://gentoo/texlive-module-collection-binextra-2016.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2016.tar.xz mirror://gentoo/texlive-module-texconfig.doc-2016.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2016.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2016.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2016.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2016.tar.xz mirror://gentoo/texlive-module-arara.doc-2016.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2016.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2016.tar.xz mirror://gentoo/texlive-module-checklistings.doc-2016.tar.xz mirror://gentoo/texlive-module-ctan_chk.doc-2016.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2016.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2016.tar.xz mirror://gentoo/texlive-module-ctie.doc-2016.tar.xz mirror://gentoo/texlive-module-cweb.doc-2016.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2016.tar.xz mirror://gentoo/texlive-module-dtl.doc-2016.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2016.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2016.tar.xz mirror://gentoo/texlive-module-dviasm.doc-2016.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2016.tar.xz mirror://gentoo/texlive-module-dvidvi.doc-2016.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2016.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2016.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2016.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2016.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg.doc-2016.tar.xz mirror://gentoo/texlive-module-installfont.doc-2016.tar.xz mirror://gentoo/texlive-module-lacheck.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-papersize.doc-2016.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2016.tar.xz mirror://gentoo/texlive-module-latex2nemeth.doc-2016.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2016.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2016.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2016.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2016.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2016.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2016.tar.xz mirror://gentoo/texlive-module-make4ht.doc-2016.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2016.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2016.tar.xz mirror://gentoo/texlive-module-patgen.doc-2016.tar.xz mirror://gentoo/texlive-module-pdfbook2.doc-2016.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2016.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale.doc-2016.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2016.tar.xz mirror://gentoo/texlive-module-pdfxup.doc-2016.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2016.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2016.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2016.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2016.tar.xz mirror://gentoo/texlive-module-pythontex.doc-2016.tar.xz mirror://gentoo/texlive-module-seetexk.doc-2016.tar.xz mirror://gentoo/texlive-module-srcredact.doc-2016.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2016.tar.xz mirror://gentoo/texlive-module-synctex.doc-2016.tar.xz mirror://gentoo/texlive-module-tex4ebook.doc-2016.tar.xz mirror://gentoo/texlive-module-texcount.doc-2016.tar.xz mirror://gentoo/texlive-module-texdef.doc-2016.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2016.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2016.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2016.tar.xz mirror://gentoo/texlive-module-texfot.doc-2016.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2016.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2016.tar.xz mirror://gentoo/texlive-module-texosquery.doc-2016.tar.xz mirror://gentoo/texlive-module-texware.doc-2016.tar.xz mirror://gentoo/texlive-module-tie.doc-2016.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2016.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2016.tar.xz mirror://gentoo/texlive-module-web.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2016.tar.xz mirror://gentoo/texlive-module-arara.source-2016.tar.xz mirror://gentoo/texlive-module-checklistings.source-2016.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2016.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2016.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2016.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2016.tar.xz mirror://gentoo/texlive-module-pythontex.source-2016.tar.xz mirror://gentoo/texlive-module-texdef.source-2016.tar.xz mirror://gentoo/texlive-module-texosquery.source-2016.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=41a44909c67ab562c9d4fc58df4aa5a7
diff --git a/metadata/md5-cache/app-text/texlive-core-2017-r3 b/metadata/md5-cache/app-text/texlive-core-2017-r3
new file mode 100644
index 000000000000..7e5f1cfac929
--- /dev/null
+++ b/metadata/md5-cache/app-text/texlive-core-2017-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare unpack
+DEPEND=X? ( x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXaw ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2014 !<dev-texlive/texlive-metapost-2011 !app-text/dvibook !dev-tex/luatex !app-text/dvipdfm !app-text/dvipdfmx !app-text/xdvipdfmx sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= >=app-text/poppler-0.12.3-r3:= >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0= xetex? ( >=media-libs/harfbuzz-1.4.5[icu,graphite] >=dev-libs/icu-50:= >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/kpathsea-6.2.3 cjk? ( >=dev-libs/ptexenc-1.3.5 ) virtual/pkgconfig sys-apps/ed sys-devel/flex app-arch/xz-utils >=app-portage/elt-patches-20170422
+DESCRIPTION=A complete TeX distribution
+EAPI=5
+HOMEPAGE=http://tug.org/texlive/
+IUSE=cjk X doc source tk +luajittex xetex
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LPPL-1.3c TeX
+RDEPEND=X? ( x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXaw ) !app-text/ptex !app-text/tetex !<app-text/texlive-2007 !app-text/xetex !<dev-texlive/texlive-basic-2014 !<dev-texlive/texlive-metapost-2011 !app-text/dvibook !dev-tex/luatex !app-text/dvipdfm !app-text/dvipdfmx !app-text/xdvipdfmx sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0= >=app-text/poppler-0.12.3-r3:= >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0= xetex? ( >=media-libs/harfbuzz-1.4.5[icu,graphite] >=dev-libs/icu-50:= >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/kpathsea-6.2.3 cjk? ( >=dev-libs/ptexenc-1.3.5 ) >=app-text/ps2pkm-1.8_p20170524 >=app-text/dvipsk-5.997 >=dev-tex/bibtexu-3.71_p20170524 virtual/perl-Getopt-Long tk? ( dev-perl/Tk )
+SLOT=0
+SRC_URI=mirror://gentoo/texlive-20170524-source.tar.xz mirror://gentoo/texlive-core-patches-70.tar.xz mirror://gentoo/texlive-module-tetex-2017.tar.xz mirror://gentoo/texlive-module-hyphen-base-2017.tar.xz mirror://gentoo/texlive-module-texconfig-2017.tar.xz mirror://gentoo/texlive-module-gsftopk-2017.tar.xz mirror://gentoo/texlive-module-texlive.infra-2017.tar.xz mirror://gentoo/texlive-module-a2ping-2017.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2017.tar.xz mirror://gentoo/texlive-module-arara-2017.tar.xz mirror://gentoo/texlive-module-asymptote-2017.tar.xz mirror://gentoo/texlive-module-bundledoc-2017.tar.xz mirror://gentoo/texlive-module-checklistings-2017.tar.xz mirror://gentoo/texlive-module-ctan_chk-2017.tar.xz mirror://gentoo/texlive-module-ctanify-2017.tar.xz mirror://gentoo/texlive-module-ctanupload-2017.tar.xz mirror://gentoo/texlive-module-ctie-2017.tar.xz mirror://gentoo/texlive-module-cweb-2017.tar.xz mirror://gentoo/texlive-module-de-macro-2017.tar.xz mirror://gentoo/texlive-module-dtl-2017.tar.xz mirror://gentoo/texlive-module-dtxgen-2017.tar.xz mirror://gentoo/texlive-module-dvi2tty-2017.tar.xz mirror://gentoo/texlive-module-dviasm-2017.tar.xz mirror://gentoo/texlive-module-dvicopy-2017.tar.xz mirror://gentoo/texlive-module-dvidvi-2017.tar.xz mirror://gentoo/texlive-module-dviljk-2017.tar.xz mirror://gentoo/texlive-module-dvipos-2017.tar.xz mirror://gentoo/texlive-module-findhyph-2017.tar.xz mirror://gentoo/texlive-module-fragmaster-2017.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg-2017.tar.xz mirror://gentoo/texlive-module-hyphenex-2017.tar.xz mirror://gentoo/texlive-module-installfont-2017.tar.xz mirror://gentoo/texlive-module-lacheck-2017.tar.xz mirror://gentoo/texlive-module-latex-git-log-2017.tar.xz mirror://gentoo/texlive-module-latex-papersize-2017.tar.xz mirror://gentoo/texlive-module-latex2man-2017.tar.xz mirror://gentoo/texlive-module-latex2nemeth-2017.tar.xz mirror://gentoo/texlive-module-latexfileversion-2017.tar.xz mirror://gentoo/texlive-module-latexpand-2017.tar.xz mirror://gentoo/texlive-module-latexindent-2017.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2017.tar.xz mirror://gentoo/texlive-module-ltximg-2017.tar.xz mirror://gentoo/texlive-module-listings-ext-2017.tar.xz mirror://gentoo/texlive-module-make4ht-2017.tar.xz mirror://gentoo/texlive-module-match_parens-2017.tar.xz mirror://gentoo/texlive-module-mflua-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2017.tar.xz mirror://gentoo/texlive-module-patgen-2017.tar.xz mirror://gentoo/texlive-module-pdfbook2-2017.tar.xz mirror://gentoo/texlive-module-pdfcrop-2017.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale-2017.tar.xz mirror://gentoo/texlive-module-pdftools-2017.tar.xz mirror://gentoo/texlive-module-pdfxup-2017.tar.xz mirror://gentoo/texlive-module-pfarrei-2017.tar.xz mirror://gentoo/texlive-module-pkfix-2017.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2017.tar.xz mirror://gentoo/texlive-module-purifyeps-2017.tar.xz mirror://gentoo/texlive-module-seetexk-2017.tar.xz mirror://gentoo/texlive-module-srcredact-2017.tar.xz mirror://gentoo/texlive-module-sty2dtx-2017.tar.xz mirror://gentoo/texlive-module-synctex-2017.tar.xz mirror://gentoo/texlive-module-tex4ebook-2017.tar.xz mirror://gentoo/texlive-module-texcount-2017.tar.xz mirror://gentoo/texlive-module-texdef-2017.tar.xz mirror://gentoo/texlive-module-texdiff-2017.tar.xz mirror://gentoo/texlive-module-texdirflatten-2017.tar.xz mirror://gentoo/texlive-module-texdoc-2017.tar.xz mirror://gentoo/texlive-module-texfot-2017.tar.xz mirror://gentoo/texlive-module-texliveonfly-2017.tar.xz mirror://gentoo/texlive-module-texloganalyser-2017.tar.xz mirror://gentoo/texlive-module-texosquery-2017.tar.xz mirror://gentoo/texlive-module-texware-2017.tar.xz mirror://gentoo/texlive-module-tie-2017.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2017.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2017.tar.xz mirror://gentoo/texlive-module-web-2017.tar.xz mirror://gentoo/texlive-module-collection-binextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2017.tar.xz mirror://gentoo/texlive-module-texconfig.doc-2017.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2017.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2017.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2017.tar.xz mirror://gentoo/texlive-module-arara.doc-2017.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2017.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2017.tar.xz mirror://gentoo/texlive-module-checklistings.doc-2017.tar.xz mirror://gentoo/texlive-module-ctan_chk.doc-2017.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2017.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2017.tar.xz mirror://gentoo/texlive-module-ctie.doc-2017.tar.xz mirror://gentoo/texlive-module-cweb.doc-2017.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2017.tar.xz mirror://gentoo/texlive-module-dtl.doc-2017.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2017.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2017.tar.xz mirror://gentoo/texlive-module-dviasm.doc-2017.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2017.tar.xz mirror://gentoo/texlive-module-dvidvi.doc-2017.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2017.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2017.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2017.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2017.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg.doc-2017.tar.xz mirror://gentoo/texlive-module-installfont.doc-2017.tar.xz mirror://gentoo/texlive-module-lacheck.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-papersize.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2nemeth.doc-2017.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2017.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2017.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2017.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2017.tar.xz mirror://gentoo/texlive-module-make4ht.doc-2017.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2017.tar.xz mirror://gentoo/texlive-module-patgen.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfbook2.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2017.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfxup.doc-2017.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2017.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2017.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2017.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2017.tar.xz mirror://gentoo/texlive-module-pythontex.doc-2017.tar.xz mirror://gentoo/texlive-module-seetexk.doc-2017.tar.xz mirror://gentoo/texlive-module-srcredact.doc-2017.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2017.tar.xz mirror://gentoo/texlive-module-synctex.doc-2017.tar.xz mirror://gentoo/texlive-module-tex4ebook.doc-2017.tar.xz mirror://gentoo/texlive-module-texcount.doc-2017.tar.xz mirror://gentoo/texlive-module-texdef.doc-2017.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2017.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2017.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-texfot.doc-2017.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2017.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2017.tar.xz mirror://gentoo/texlive-module-texosquery.doc-2017.tar.xz mirror://gentoo/texlive-module-texware.doc-2017.tar.xz mirror://gentoo/texlive-module-tie.doc-2017.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2017.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-web.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2017.tar.xz mirror://gentoo/texlive-module-arara.source-2017.tar.xz mirror://gentoo/texlive-module-checklistings.source-2017.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2017.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2017.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2017.tar.xz mirror://gentoo/texlive-module-pythontex.source-2017.tar.xz mirror://gentoo/texlive-module-texdef.source-2017.tar.xz mirror://gentoo/texlive-module-texosquery.source-2017.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	texlive-common	f68a634c367f10b9fbb8fb02195ba411	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=570e5e2de97a4faa3ebf2dbf3656f488
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 63e88346e054..8fa65b9c80e8 100644
--- a/metadata/md5-cache/app-vim/Manifest.gz
+++ b/metadata/md5-cache/app-vim/Manifest.gz
diff --git a/metadata/md5-cache/app-vim/molokai-0.1_p20151115 b/metadata/md5-cache/app-vim/molokai-0.1_p20151115
index 54cc3cb334e8..d41fa0767616 100644
--- a/metadata/md5-cache/app-vim/molokai-0.1_p20151115
+++ b/metadata/md5-cache/app-vim/molokai-0.1_p20151115
@@ -1,12 +1,12 @@
-DEFINED_PHASES=install postinst postrm
+DEFINED_PHASES=install postinst postrm unpack
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: molokai color scheme
 EAPI=6
 HOMEPAGE=https://github.com/tomasr/molokai
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tomasr/molokai/archive/c67bdfcdb31415aa0ade7f8c003261700a885476.tar.gz -> molokai-0.1_p20151115.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=d30e9e144dbdfaf9aa7dab4621e32364
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=38b721b74bea69a106ca909a4071ed8a
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index de678eba7f88..777f6038b3c7 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/perl-5.24.3 b/metadata/md5-cache/dev-lang/perl-5.24.3
index 57f1acc52441..8666ea97e53f 100644
--- a/metadata/md5-cache/dev-lang/perl-5.24.3
+++ b/metadata/md5-cache/dev-lang/perl-5.24.3
@@ -9,6 +9,6 @@ LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Path-2.130.0 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) app-arch/bzip2 sys-libs/zlib
 SLOT=0/5.24
-SRC_URI=mirror://cpan/src/5.0/perl-5.24.3.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.24.3.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.24.3-patches-1/perl-5.24.3-patches-1.tar.xz mirror://gentoo/perl-5.24.3-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.24.3-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.7/perl-cross-1.1.7.tar.gz
+SRC_URI=mirror://cpan/src/5.0/perl-5.24.3.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.24.3.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.24.3-patches-2/perl-5.24.3-patches-2.tar.xz mirror://gentoo/perl-5.24.3-patches-2.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.24.3-patches-2.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.7/perl-cross-1.1.7.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=cf39a1c4ca94f05ca1a97efdc334b6c2
+_md5_=2f65a3920682db7c3ac85a9f839b786b
diff --git a/metadata/md5-cache/dev-lang/perl-5.26.1-r1 b/metadata/md5-cache/dev-lang/perl-5.26.1-r1
index 630c8e313c58..48c55d65b8cf 100644
--- a/metadata/md5-cache/dev-lang/perl-5.26.1-r1
+++ b/metadata/md5-cache/dev-lang/perl-5.26.1-r1
@@ -9,6 +9,6 @@ LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) app-arch/bzip2 sys-libs/zlib
 SLOT=0/5.26
-SRC_URI=mirror://cpan/src/5.0/perl-5.26.1.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.26.1.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.25.11-patches-1/perl-5.25.11-patches-1.tar.xz mirror://gentoo/perl-5.25.11-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.25.11-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.7/perl-cross-1.1.7.tar.gz
+SRC_URI=mirror://cpan/src/5.0/perl-5.26.1.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.26.1.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.26.1-patches-1/perl-5.26.1-patches-1.tar.xz mirror://gentoo/perl-5.26.1-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.26.1-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.7/perl-cross-1.1.7.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=da83411990973bbcba0ff657e709776d
+_md5_=19d728b9997e55310a5d0bf8353ec6e2
diff --git a/metadata/md5-cache/dev-lang/perl-5.26.9999 b/metadata/md5-cache/dev-lang/perl-5.26.9999
index 124894f594e6..505884cdc77e 100644
--- a/metadata/md5-cache/dev-lang/perl-5.26.9999
+++ b/metadata/md5-cache/dev-lang/perl-5.26.9999
@@ -8,6 +8,6 @@ LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) app-arch/bzip2 sys-libs/zlib
 SLOT=0/5.26
-SRC_URI=mirror://cpan/src/5.0/perl-5.26.1-RC1.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.26.1-RC1.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.25.11-patches-1/perl-5.25.11-patches-1.tar.xz mirror://gentoo/perl-5.25.11-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.25.11-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.7/perl-cross-1.1.7.tar.gz
+SRC_URI=mirror://cpan/src/5.0/perl-5.26.1-RC1.tar.xz mirror://cpan/authors/id/S/SH/SHAY/perl-5.26.1-RC1.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.26.1-patches-1/perl-5.26.1-patches-1.tar.xz mirror://gentoo/perl-5.26.1-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.26.1-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.7/perl-cross-1.1.7.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5482c94deb9359b351b7925fe3a7e1c6
+_md5_=d3bd9a1452eb835f15b40a942af5a24a
diff --git a/metadata/md5-cache/dev-lang/perl-5.28.9999 b/metadata/md5-cache/dev-lang/perl-5.28.9999
index 02bd816da519..179490c26b19 100644
--- a/metadata/md5-cache/dev-lang/perl-5.28.9999
+++ b/metadata/md5-cache/dev-lang/perl-5.28.9999
@@ -8,6 +8,6 @@ LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) app-arch/bzip2 sys-libs/zlib
 SLOT=0/5.27.7
-SRC_URI=mirror://cpan/src/5.0/perl-5.27.7.tar.xz mirror://cpan/authors/id/B/BI/BINGOS/perl-5.27.7.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.27.6-patches-1/perl-5.27.6-patches-1.tar.xz mirror://gentoo/perl-5.27.6-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.27.6-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.8/perl-cross-1.1.8.tar.gz
+SRC_URI=mirror://cpan/src/5.0/perl-5.27.7.tar.xz mirror://cpan/authors/id/B/BI/BINGOS/perl-5.27.7.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.27.7-patches-1/perl-5.27.7-patches-1.tar.xz mirror://gentoo/perl-5.27.7-patches-1.tar.xz https://dev.gentoo.org/~kentnl/distfiles/perl-5.27.7-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.1.8/perl-cross-1.1.8.tar.gz
 _eclasses_=alternatives	6c575717515f030736d1b718d507d2f9	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5c283aead0cacc114e70450dc8ff766a
+_md5_=158ee3f22f1a90aefb6237dd06725772
diff --git a/metadata/md5-cache/dev-lang/php-5.6.33 b/metadata/md5-cache/dev-lang/php-5.6.33
index 1548037f4504..f7a2a6ca9368 100644
--- a/metadata/md5-cache/dev-lang/php-5.6.33
+++ b/metadata/md5-cache/dev-lang/php-5.6.33
@@ -4,11 +4,11 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=6
 HOMEPAGE=https://secure.php.net/
 IUSE=embed +cli cgi fpm apache2 threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) vpx? ( media-libs/libvpx:0= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) recode? ( !imap !mysql !mysqli !libmysqlclient ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) sharedmem? ( !threads )
 SLOT=5.6
 SRC_URI=https://php.net/distributions/php-5.6.33.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=391914f689f9755f33932dbe8365ba20
+_md5_=489abba9f5290cd7290722d5b837195e
diff --git a/metadata/md5-cache/dev-lang/php-7.0.27 b/metadata/md5-cache/dev-lang/php-7.0.27
index d2e651c17bae..e5005e9dff1d 100644
--- a/metadata/md5-cache/dev-lang/php-7.0.27
+++ b/metadata/md5-cache/dev-lang/php-7.0.27
@@ -4,11 +4,11 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=6
 HOMEPAGE=https://secure.php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) )
 SLOT=7.0
 SRC_URI=https://secure.php.net/distributions/php-7.0.27.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=4dbf0d9b4b3d157a39814863348d2f7e
+_md5_=a853ed1f5b62e750234df2a6562910e2
diff --git a/metadata/md5-cache/dev-lang/php-7.1.13 b/metadata/md5-cache/dev-lang/php-7.1.13
index 4b465f432a40..7cfedf3241d8 100644
--- a/metadata/md5-cache/dev-lang/php-7.1.13
+++ b/metadata/md5-cache/dev-lang/php-7.1.13
@@ -4,11 +4,11 @@ DESCRIPTION=The PHP language runtime engine
 EAPI=6
 HOMEPAGE=https://secure.php.net/
 IUSE=embed +cli cgi fpm apache2 phpdbg threads acl bcmath berkdb bzip2 calendar cdb cjk coverage crypt +ctype curl debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd test tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
 RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[kerberos=,ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib:0= ) zlib? ( sys-libs/zlib:0= ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) )
 REQUIRED_USE=|| ( cli cgi fpm apache2 embed phpdbg ) cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli !mysql ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) )
 SLOT=7.1
 SRC_URI=https://secure.php.net/distributions/php-7.1.13.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e1a83ed032f3d72bd3579f82fb98b862
+_md5_=80105b5ec8a522588c6a5edb2d9172d4
diff --git a/metadata/md5-cache/dev-lang/python-3.4.5-r1 b/metadata/md5-cache/dev-lang/python-3.4.5-r1
index 1661cd7aa461..797b275fd138 100644
--- a/metadata/md5-cache/dev-lang/python-3.4.5-r1
+++ b/metadata/md5-cache/dev-lang/python-3.4.5-r1
@@ -1,14 +1,15 @@
 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(-)] >=app-portage/elt-patches-20170422 !<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 test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig >=sys-devel/autoconf-2.65 !sys-devel/gcc[libffi(-)] >=app-portage/elt-patches-20170422 !<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=https://www.python.org/
-IUSE=build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml
+IUSE=build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=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 !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
 SLOT=3.4/3.4m
 SRC_URI=https://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	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2b651fb5d07e2be3130a256b2e416ba1
+_md5_=7f798562ae7daaed2f546fa8ef4196c7
diff --git a/metadata/md5-cache/dev-lang/python-3.5.4-r1 b/metadata/md5-cache/dev-lang/python-3.5.4-r1
index a27464ff44c3..3d91434f84f3 100644
--- a/metadata/md5-cache/dev-lang/python-3.5.4-r1
+++ b/metadata/md5-cache/dev-lang/python-3.5.4-r1
@@ -1,14 +1,15 @@
 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/gcc[libffi(-)] >=app-portage/elt-patches-20170422 !<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 test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=app-portage/elt-patches-20170422 !<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=https://www.python.org/
-IUSE=build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml
+IUSE=build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=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 !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
 SLOT=3.5/3.5m
 SRC_URI=https://www.python.org/ftp/python/3.5.4/Python-3.5.4.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.5.4-0.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ced21eb7bdb9c55c9e99fa6f81c5db46
+_md5_=87fe4324ea0c76a40142cb8505a2753a
diff --git a/metadata/md5-cache/dev-lang/python-3.6.3-r1 b/metadata/md5-cache/dev-lang/python-3.6.3-r1
index 87336f7479f5..bd995cf67a6c 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.3-r1
+++ b/metadata/md5-cache/dev-lang/python-3.6.3-r1
@@ -1,14 +1,15 @@
 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/gcc[libffi(-)] >=app-portage/elt-patches-20170422 !<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 test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=app-portage/elt-patches-20170422 !<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=https://www.python.org/
-IUSE=build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml
+IUSE=build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml
 KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=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 !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.3/Python-3.6.3.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.6.2-0.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=808849bb5f5ce008aac9df938c3beb62
+_md5_=e22eff8f9efbae5c43b86b5f3cdadd28
diff --git a/metadata/md5-cache/dev-lang/python-3.6.4 b/metadata/md5-cache/dev-lang/python-3.6.4
index e00b4b00c79d..16dab2a545fa 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.4
+++ b/metadata/md5-cache/dev-lang/python-3.6.4
@@ -1,14 +1,15 @@
 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/gcc[libffi(-)] >=app-portage/elt-patches-20170422 !<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 test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)] >=app-portage/elt-patches-20170422 !<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=6
 HOMEPAGE=https://www.python.org/
-IUSE=build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml
+IUSE=build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=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 !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.4/Python-3.6.4.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.6.4.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=aa17831fad065b83998c889c88db008c
+_md5_=75b766857452df88a5bb6777763f6bbe
diff --git a/metadata/md5-cache/dev-lang/ruby-2.2.9 b/metadata/md5-cache/dev-lang/ruby-2.2.9
index 490235c1fb8a..448ee6cd9438 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.2.9
+++ b/metadata/md5-cache/dev-lang/ruby-2.2.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20141227 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20141227 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1 >=app-portage/elt-patches-20170422 !<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=An object-oriented scripting language
 EAPI=5
 HOMEPAGE=http://www.ruby-lang.org/
@@ -7,8 +7,8 @@ IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks
 KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=>=dev-ruby/minitest-5.4.3[ruby_targets_ruby22] >=dev-ruby/power_assert-0.2.2[ruby_targets_ruby22] >=dev-ruby/test-unit-3.0.8[ruby_targets_ruby22] virtual/rubygems[ruby_targets_ruby22] >=dev-ruby/json-1.8.1[ruby_targets_ruby22] >=dev-ruby/rake-0.9.6[ruby_targets_ruby22] rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby22] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20141227 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20141227 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 SLOT=2.2
 SRC_URI=mirror://ruby/2.2/ruby-2.2.9.tar.xz https://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-2.2.9.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9a6c4d4c856846b39351d1d992c4e2dc
+_md5_=0fe2e38743b9165120c212e98da96a91
diff --git a/metadata/md5-cache/dev-lang/ruby-2.3.5 b/metadata/md5-cache/dev-lang/ruby-2.3.5
deleted file mode 100644
index ad4c4f2b1b7a..000000000000
--- a/metadata/md5-cache/dev-lang/ruby-2.3.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20151229 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1 >=app-portage/elt-patches-20170422 !<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=An object-oriented scripting language
-EAPI=5
-HOMEPAGE=https://www.ruby-lang.org/
-IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( Ruby-BSD BSD-2 )
-PDEPEND=>=dev-ruby/did_you_mean-1.0.0:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.8.3[ruby_targets_ruby23] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby23] >=dev-ruby/power_assert-0.2.6[ruby_targets_ruby23] >=dev-ruby/rake-10.4.2[ruby_targets_ruby23] >=dev-ruby/test-unit-3.1.5[ruby_targets_ruby23] virtual/rubygems[ruby_targets_ruby23] >=dev-ruby/json-1.8.3[ruby_targets_ruby23] rdoc? ( >=dev-ruby/rdoc-4.2.1[ruby_targets_ruby23] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20151229 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
-SLOT=2.3
-SRC_URI=mirror://ruby/2.3/ruby-2.3.5.tar.xz https://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-2.3.5.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d33bd4e4d9a4fa77a3d06dddc7938641
diff --git a/metadata/md5-cache/dev-lang/ruby-2.3.6 b/metadata/md5-cache/dev-lang/ruby-2.3.6
index ee7d5f4209f5..460aeb7d575c 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.3.6
+++ b/metadata/md5-cache/dev-lang/ruby-2.3.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20151229 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20151229 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1 >=app-portage/elt-patches-20170422 !<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=An object-oriented scripting language
 EAPI=5
 HOMEPAGE=https://www.ruby-lang.org/
@@ -7,8 +7,8 @@ IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=>=dev-ruby/did_you_mean-1.0.0:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.8.3[ruby_targets_ruby23] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby23] >=dev-ruby/power_assert-0.2.6[ruby_targets_ruby23] >=dev-ruby/rake-10.4.2[ruby_targets_ruby23] >=dev-ruby/test-unit-3.1.5[ruby_targets_ruby23] virtual/rubygems[ruby_targets_ruby23] >=dev-ruby/json-1.8.3[ruby_targets_ruby23] rdoc? ( >=dev-ruby/rdoc-4.2.1[ruby_targets_ruby23] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20151229 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20151229 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 SLOT=2.3
 SRC_URI=mirror://ruby/2.3/ruby-2.3.6.tar.xz https://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-2.3.6.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d33bd4e4d9a4fa77a3d06dddc7938641
+_md5_=a5a0df288c9d23d3253dd37b44ace139
diff --git a/metadata/md5-cache/dev-lang/ruby-2.4.2 b/metadata/md5-cache/dev-lang/ruby-2.4.2
deleted file mode 100644
index 83bbacdad756..000000000000
--- a/metadata/md5-cache/dev-lang/ruby-2.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1 >=app-portage/elt-patches-20170422 !<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=An object-oriented scripting language
-EAPI=6
-HOMEPAGE=http://www.ruby-lang.org/
-IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl static-libs tk xemacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( Ruby-BSD BSD-2 )
-PDEPEND=>=dev-ruby/did_you_mean-1.1.0:2.4[ruby_targets_ruby24] >=dev-ruby/minitest-5.10.1[ruby_targets_ruby24] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby24] >=dev-ruby/power_assert-0.4.1[ruby_targets_ruby24] >=dev-ruby/rake-12.0.0[ruby_targets_ruby24] >=dev-ruby/test-unit-3.2.3[ruby_targets_ruby24] >=dev-ruby/xmlrpc-0.2.1[ruby_targets_ruby24] virtual/rubygems[ruby_targets_ruby24] >=dev-ruby/json-2.0.2[ruby_targets_ruby24] rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby24] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
-SLOT=2.4
-SRC_URI=mirror://ruby/2.4/ruby-2.4.2.tar.xz https://dev.gentoo.org/~graaff/ruby-team/ruby-patches-2.4.2.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=17f1adaca04d1f3883c0e75d5a0332a4
diff --git a/metadata/md5-cache/dev-lang/ruby-2.4.3 b/metadata/md5-cache/dev-lang/ruby-2.4.3
index 62de9f10ee70..09a7fbcc355a 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.4.3
+++ b/metadata/md5-cache/dev-lang/ruby-2.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1 >=app-portage/elt-patches-20170422 !<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=An object-oriented scripting language
 EAPI=6
 HOMEPAGE=http://www.ruby-lang.org/
@@ -7,8 +7,8 @@ IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=>=dev-ruby/did_you_mean-1.1.0:2.4[ruby_targets_ruby24] >=dev-ruby/minitest-5.10.1[ruby_targets_ruby24] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby24] >=dev-ruby/power_assert-0.4.1[ruby_targets_ruby24] >=dev-ruby/rake-12.0.0[ruby_targets_ruby24] >=dev-ruby/test-unit-3.2.3[ruby_targets_ruby24] >=dev-ruby/xmlrpc-0.2.1[ruby_targets_ruby24] virtual/rubygems[ruby_targets_ruby24] >=dev-ruby/json-2.0.2[ruby_targets_ruby24] rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby24] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 SLOT=2.4
 SRC_URI=mirror://ruby/2.4/ruby-2.4.3.tar.xz https://dev.gentoo.org/~graaff/ruby-team/ruby-patches-2.4.3.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=17f1adaca04d1f3883c0e75d5a0332a4
+_md5_=7ab738a1223f75c7de169d59e465f66a
diff --git a/metadata/md5-cache/dev-lang/ruby-2.5.0 b/metadata/md5-cache/dev-lang/ruby-2.5.0
deleted file mode 100644
index 03da4d7c1e16..000000000000
--- a/metadata/md5-cache/dev-lang/ruby-2.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20171225 >=app-portage/elt-patches-20170422 !<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=An object-oriented scripting language
-EAPI=6
-HOMEPAGE=http://www.ruby-lang.org/
-IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl static-libs tk xemacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( Ruby-BSD BSD-2 )
-PDEPEND=>=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25] >=dev-ruby/minitest-5.10.3[ruby_targets_ruby25] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby25] >=dev-ruby/power_assert-1.1.1[ruby_targets_ruby25] >=dev-ruby/rake-12.3.0[ruby_targets_ruby25] >=dev-ruby/test-unit-3.2.7[ruby_targets_ruby25] >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby25] virtual/rubygems[ruby_targets_ruby24] >=dev-ruby/json-2.0.2[ruby_targets_ruby24] rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby24] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20171225
-SLOT=2.5
-SRC_URI=mirror://ruby/2.5/ruby-2.5.0.tar.xz https://dev.gentoo.org/~graaff/ruby-team/ruby-patches-2.5.0.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=8b49bc4640c5a676174a09e2a64b2e64
diff --git a/metadata/md5-cache/dev-lang/ruby-2.5.0-r1 b/metadata/md5-cache/dev-lang/ruby-2.5.0-r1
index 602c4ea152ee..0946a07d05b3 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.5.0-r1
+++ b/metadata/md5-cache/dev-lang/ruby-2.5.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20171225 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20171225 >=app-portage/elt-patches-20170422 !<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=An object-oriented scripting language
 EAPI=6
 HOMEPAGE=http://www.ruby-lang.org/
@@ -7,8 +7,8 @@ IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=>=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25] >=dev-ruby/minitest-5.10.3[ruby_targets_ruby25] >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby25] >=dev-ruby/power_assert-1.1.1[ruby_targets_ruby25] >=dev-ruby/rake-12.3.0[ruby_targets_ruby25] >=dev-ruby/test-unit-3.2.7[ruby_targets_ruby25] >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby25] virtual/rubygems[ruby_targets_ruby25] >=dev-ruby/json-2.0.2[ruby_targets_ruby25] rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby25] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20171225
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm:= ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20171225
 SLOT=2.5
 SRC_URI=mirror://ruby/2.5/ruby-2.5.0.tar.xz https://dev.gentoo.org/~graaff/ruby-team/ruby-patches-2.5.0-r1.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=27716055e05d902fe4ea9e5e9a2fe6ae
+_md5_=7200f5610c9f480cd84da4e2ccdedafe
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 22b97c077324..0230bf0e03db 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/collada-dom-2.5.0 b/metadata/md5-cache/dev-libs/collada-dom-2.5.0
new file mode 100644
index 000000000000..80500986c19e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/collada-dom-2.5.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:= sys-libs/zlib:=[minizip] dev-libs/libxml2 dev-libs/libpcre[cxx] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=COLLADA Document Object Model (DOM) C++ Library
+EAPI=5
+HOMEPAGE=https://github.com/rdiankov/collada-dom
+KEYWORDS=~amd64 ~arm
+LICENSE=MIT
+RDEPEND=dev-libs/boost:= sys-libs/zlib:=[minizip] dev-libs/libxml2 dev-libs/libpcre[cxx]
+SLOT=0/25
+SRC_URI=https://github.com/rdiankov/collada-dom/archive/v2.5.0.tar.gz -> collada-dom-2.5.0.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b46c15a8cca272921285240eed14d4a2
diff --git a/metadata/md5-cache/dev-libs/collada-dom-9999 b/metadata/md5-cache/dev-libs/collada-dom-9999
index 0ca944d8b309..e883f598d1e0 100644
--- a/metadata/md5-cache/dev-libs/collada-dom-9999
+++ b/metadata/md5-cache/dev-libs/collada-dom-9999
@@ -5,6 +5,6 @@ EAPI=5
 HOMEPAGE=https://github.com/rdiankov/collada-dom
 LICENSE=MIT
 RDEPEND=dev-libs/boost:= sys-libs/zlib:=[minizip] dev-libs/libxml2 dev-libs/libpcre[cxx]
-SLOT=0
+SLOT=0/25
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bc5fa6831da4c518c041d96d22dcc551
+_md5_=b46c15a8cca272921285240eed14d4a2
diff --git a/metadata/md5-cache/dev-libs/libical-3.0.1 b/metadata/md5-cache/dev-libs/libical-3.0.1
index 4f0f6da0bfb6..71202e06a9c3 100644
--- a/metadata/md5-cache/dev-libs/libical-3.0.1
+++ b/metadata/md5-cache/dev-libs/libical-3.0.1
@@ -5,9 +5,9 @@ EAPI=6
 HOMEPAGE=https://github.com/libical/libical
 IUSE=berkdb doc examples static-libs test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=|| ( MPL-1.0 LGPL-2.1 )
+LICENSE=|| ( MPL-2.0 LGPL-2.1 )
 RDEPEND=dev-libs/icu:= berkdb? ( sys-libs/db:= ) sys-libs/timezone-data
 SLOT=0/3
 SRC_URI=https://github.com/libical/libical/archive/v3.0.1.tar.gz -> libical-3.0.1.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1eb32cb2b6defd45a8e033d70ecd332b
+_md5_=6a70d9d02dac2ceab0ef75e170cd6d83
diff --git a/metadata/md5-cache/dev-perl/B-Utils-0.270.0 b/metadata/md5-cache/dev-perl/B-Utils-0.270.0
index 9bc5c37686ad..b3aefff068aa 100644
--- a/metadata/md5-cache/dev-perl/B-Utils-0.270.0
+++ b/metadata/md5-cache/dev-perl/B-Utils-0.270.0
@@ -4,10 +4,10 @@ DESCRIPTION=Helper functions for op tree manipulation
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/B-Utils/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter virtual/perl-Scalar-List-Utils dev-perl/Task-Weaken dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/B-Utils-0.27.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=efcfac21bdd7a4aef6bd71ff66c3d1b3
+_md5_=9fba31cd63b6a1355d96f4035269f848
diff --git a/metadata/md5-cache/dev-perl/DBI-1.637.0 b/metadata/md5-cache/dev-perl/DBI-1.637.0
index 305a05e3289b..1b382428e158 100644
--- a/metadata/md5-cache/dev-perl/DBI-1.637.0
+++ b/metadata/md5-cache/dev-perl/DBI-1.637.0
@@ -4,10 +4,10 @@ DESCRIPTION=Database independent interface for Perl
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/DBI/
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/PlRPC-0.200.0 >=virtual/perl-Sys-Syslog-0.170.0 virtual/perl-File-Spec !<=dev-perl/SQL-Statement-1.330.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TIMB/DBI-1.637.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=475ceb207de452c8494a5644d76bef15
+_md5_=a4f3d6aaadf860097f090203c442599e
diff --git a/metadata/md5-cache/dev-perl/IO-All-0.870.0 b/metadata/md5-cache/dev-perl/IO-All-0.870.0
index a95da328698a..249ad0d590ee 100644
--- a/metadata/md5-cache/dev-perl/IO-All-0.870.0
+++ b/metadata/md5-cache/dev-perl/IO-All-0.870.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=
 DESCRIPTION=unified IO operations
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/IO-All/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FREW/IO-All-0.87.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=18ed5eefc4f3a643b5eadfcf88392f44
+_md5_=2555aff074850741dbcc6b4f235d19b1
diff --git a/metadata/md5-cache/dev-perl/IO-Pager-0.390.0 b/metadata/md5-cache/dev-perl/IO-Pager-0.390.0
index b547cb9ab3cd..375bfa3a3f34 100644
--- a/metadata/md5-cache/dev-perl/IO-Pager-0.390.0
+++ b/metadata/md5-cache/dev-perl/IO-Pager-0.390.0
@@ -4,10 +4,10 @@ DESCRIPTION=Select a pager, optionally pipe it output if destination is a TTY
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/IO-Pager/
 IUSE=test
-KEYWORDS=~amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-File-Spec dev-perl/File-Which virtual/perl-IO dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-0.39.tgz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=fdafc18e7491460e1b7c2c656990f406
+_md5_=ca8e2b09a75df8f124cc8aa5dc1cac08
diff --git a/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2 b/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2
index 1a97fc1e0efc..00c12195e0da 100644
--- a/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2
+++ b/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Does your process have access to the web
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/LWP-Online/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/libwww-perl-5.805.0 >=dev-perl/URI-1.350.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/LWP-Online-1.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=d3ecb041e14ad68861f759e5a3d2e6a4
+_md5_=0faa2a3543c7aa99d7030afbe7bbc298
diff --git a/metadata/md5-cache/dev-perl/Lexical-SealRequireHints-0.11.0 b/metadata/md5-cache/dev-perl/Lexical-SealRequireHints-0.11.0
index d4990d9415fa..737a1c87f89f 100644
--- a/metadata/md5-cache/dev-perl/Lexical-SealRequireHints-0.11.0
+++ b/metadata/md5-cache/dev-perl/Lexical-SealRequireHints-0.11.0
@@ -4,10 +4,10 @@ DESCRIPTION=Prevent leakage of lexical hints
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Lexical-SealRequireHints/
 IUSE=test
-KEYWORDS=~amd64 ~hppa ~ppc x86
+KEYWORDS=~amd64 ~hppa ppc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/B-Hooks-OP-Check-0.190.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Lexical-SealRequireHints-0.011.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=d3f11645c003fc4d6591abf693cf4d65
+_md5_=aa52991a22b6dfbd97206a1ac17b1d3b
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index bae6d937da1e..8fa9eb618be4 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Module-Info-0.370.0-r1 b/metadata/md5-cache/dev-perl/Module-Info-0.370.0-r1
index 629c819afb33..027c9ef6d67d 100644
--- a/metadata/md5-cache/dev-perl/Module-Info-0.370.0-r1
+++ b/metadata/md5-cache/dev-perl/Module-Info-0.370.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Information about Perl modules
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Module-Info/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 x86
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/B-Utils-0.270.0 virtual/perl-Carp >=virtual/perl-File-Spec-0.800.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Module-Info-0.37.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=86da8097e83b0c2c85f058c0fbcb6709
+_md5_=1abdab7d757dea3d8650db08d08d4eb9
diff --git a/metadata/md5-cache/dev-perl/Module-Runtime-0.16.0 b/metadata/md5-cache/dev-perl/Module-Runtime-0.16.0
index 2fdc46b1bfba..9e6704b9cfe2 100644
--- a/metadata/md5-cache/dev-perl/Module-Runtime-0.16.0
+++ b/metadata/md5-cache/dev-perl/Module-Runtime-0.16.0
@@ -4,10 +4,10 @@ DESCRIPTION=Runtime module handling
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Module-Runtime/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.016.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=c9c891cd8fd44fc4c324c9020334676c
+_md5_=ab347eb1e7f6729d2b47853b2ad607c7
diff --git a/metadata/md5-cache/dev-perl/MusicBrainz-DiscID-0.40.0 b/metadata/md5-cache/dev-perl/MusicBrainz-DiscID-0.40.0
index 55eeefafdfa5..508a3d145467 100644
--- a/metadata/md5-cache/dev-perl/MusicBrainz-DiscID-0.40.0
+++ b/metadata/md5-cache/dev-perl/MusicBrainz-DiscID-0.40.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl interface for the MusicBrainz libdiscid library
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/MusicBrainz-DiscID/
 IUSE=test examples
-KEYWORDS=~amd64 ~ppc ~ppc64 x86
+KEYWORDS=~amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdiscid-0.2.2 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NJ/NJH/MusicBrainz-DiscID-0.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=e9eea62d15b19b7a4e6b7ea6cba359b4
+_md5_=f4911f0eba60b741c260c362d798a04f
diff --git a/metadata/md5-cache/dev-perl/Net-Daemon-0.480.0-r2 b/metadata/md5-cache/dev-perl/Net-Daemon-0.480.0-r2
index de75fb74a12d..9d1436b90793 100644
--- a/metadata/md5-cache/dev-perl/Net-Daemon-0.480.0-r2
+++ b/metadata/md5-cache/dev-perl/Net-Daemon-0.480.0-r2
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=
 DESCRIPTION=Abstract base class for portable servers
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Net-Daemon/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MN/MNOONING/Net-Daemon-0.48.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=ea01f6322f0de865566e69613fb2a341
+_md5_=1d32258da794273ec1a69d25d9204a1b
diff --git a/metadata/md5-cache/dev-perl/Net-SSLeay-1.820.0 b/metadata/md5-cache/dev-perl/Net-SSLeay-1.820.0
index 711fbfe80258..fd8cdf7eeae7 100644
--- a/metadata/md5-cache/dev-perl/Net-SSLeay-1.820.0
+++ b/metadata/md5-cache/dev-perl/Net-SSLeay-1.820.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl extension for using OpenSSL
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Net-SSLeay/
 IUSE=libressl test minimal examples examples
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=openssl
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) virtual/perl-MIME-Base64 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/M/MI/MIKEM/Net-SSLeay-1.82.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d6fa9e87a4c3d125cb419c99b8709b26
+_md5_=e20185f17c3a659368025a439595284b
diff --git a/metadata/md5-cache/dev-perl/Net-Server-2.9.0 b/metadata/md5-cache/dev-perl/Net-Server-2.9.0
index aa30633df9a0..f9583cec43a3 100644
--- a/metadata/md5-cache/dev-perl/Net-Server-2.9.0
+++ b/metadata/md5-cache/dev-perl/Net-Server-2.9.0
@@ -4,10 +4,10 @@ DESCRIPTION=Extensible, general Perl server engine
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Net-Server/
 IUSE=ipv6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/IO-Multiplex ipv6? ( dev-perl/IO-Socket-INET6 ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RH/RHANDOM/Net-Server-2.009.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=01f27c8712ff5705bac158c0b146a81c
+_md5_=1bfc759817d8260f5957e0ef6e3b7ac8
diff --git a/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0 b/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0
index 031eaa9ac982..e5836ad27d61 100644
--- a/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0
+++ b/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=XMPP Perl Library
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Net-XMPP/
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-perl/Authen-SASL-2.120.0 virtual/perl-Digest-SHA virtual/perl-Scalar-List-Utils >=dev-perl/XML-Stream-1.240.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAPATRICK/Net-XMPP-1.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=03e668d56478026245057be2efe69c58
+_md5_=22c483e229c00477745f6e261a2a9417
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 39bb4ba7f4d0..5276ee899bf4 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/neovim-python-client-0.1.13 b/metadata/md5-cache/dev-python/neovim-python-client-0.1.13
index 28bdd36d51f6..81b4c9081b67 100644
--- a/metadata/md5-cache/dev-python/neovim-python-client-0.1.13
+++ b/metadata/md5-cache/dev-python/neovim-python-client-0.1.13
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=https://github.com/neovim/python-client/archive/0.1.13.tar.gz -> neovim-python-client-0.1.13.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=669ba2dc25d981d112209e4be12233bc
+_md5_=7ce040d16d36224195751a72e8bfe4ac
diff --git a/metadata/md5-cache/dev-python/neovim-python-client-0.1.9 b/metadata/md5-cache/dev-python/neovim-python-client-0.1.9
index 58cd01b8c16a..bd2f08f6d9e4 100644
--- a/metadata/md5-cache/dev-python/neovim-python-client-0.1.9
+++ b/metadata/md5-cache/dev-python/neovim-python-client-0.1.9
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/msgpack-0.4.0[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/python-greenlet[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-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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(-)]
+DEPEND=>=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-greenlet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Python client for Neovim
 EAPI=5
 HOMEPAGE=https://github.com/neovim/python-client
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/msgpack-0.4.0[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/python-greenlet[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-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=app-editors/neovim-0.1.3 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 )
+RDEPEND=>=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-greenlet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=app-editors/neovim-0.1.3 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/neovim/python-client/archive/0.1.9.tar.gz -> neovim-python-client-0.1.9.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=db37435887604449d072a5d331b8a287
+_md5_=69c67c21e42e72f7f181b34c865bc9e8
diff --git a/metadata/md5-cache/dev-python/neovim-python-client-0.2.0 b/metadata/md5-cache/dev-python/neovim-python-client-0.2.0
index a40e5ed93b76..45ddf6255e4c 100644
--- a/metadata/md5-cache/dev-python/neovim-python-client-0.2.0
+++ b/metadata/md5-cache/dev-python/neovim-python-client-0.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/msgpack-0.4.0[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/python-greenlet[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-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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(-)]
+DEPEND=>=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-greenlet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Python client for Neovim
 EAPI=5
 HOMEPAGE=https://github.com/neovim/python-client
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/msgpack-0.4.0[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/python-greenlet[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-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) app-editors/neovim 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 )
+RDEPEND=>=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-greenlet[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) app-editors/neovim 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://github.com/neovim/python-client/archive/0.2.0.tar.gz -> neovim-python-client-0.2.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3cd9319aaecc60317bce6a8d9dcb0e85
+_md5_=2ccf082f8c8bd05d06f5c7691b624f8a
diff --git a/metadata/md5-cache/dev-python/rackspace-monitoring-0.8.0 b/metadata/md5-cache/dev-python/rackspace-monitoring-0.8.0
new file mode 100644
index 000000000000..b2109f3013fb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rackspace-monitoring-0.8.0
@@ -0,0 +1,15 @@
+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/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/libcloud-0.17.0[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/libcloud-2.0[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(-)]
+DESCRIPTION=Client library for Rackspace Cloud Monitoring
+EAPI=5
+HOMEPAGE=https://github.com/racker/rackspace-monitoring
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/libcloud-0.17.0[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/libcloud-2.0[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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/r/rackspace-monitoring/rackspace-monitoring-0.8.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6dc4a0eca281ff9f12cfe6a597683ee1
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index 26d7138f263c..3642376bf014 100644
--- a/metadata/md5-cache/dev-ros/Manifest.gz
+++ b/metadata/md5-cache/dev-ros/Manifest.gz
diff --git a/metadata/md5-cache/dev-ros/collada_parser-1.12.10-r1 b/metadata/md5-cache/dev-ros/collada_parser-1.12.10-r2
index 4e289cb62c72..ef977b17184f 100644
--- a/metadata/md5-cache/dev-ros/collada_parser-1.12.10-r1
+++ b/metadata/md5-cache/dev-ros/collada_parser-1.12.10-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/roscpp dev-ros/class_loader dev-libs/urdfdom_headers dev-libs/collada-dom >=dev-ros/urdf-1.12.6 dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/roscpp dev-ros/class_loader dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=C++ parser for the Collada robot description format
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/collada_parser
 IUSE=python_targets_python2_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/roscpp dev-ros/class_loader dev-libs/urdfdom_headers dev-libs/collada-dom >=dev-ros/urdf-1.12.6 dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/roscpp dev-ros/class_loader dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/collada_urdf/archive/1.12.10.tar.gz -> collada_urdf-1.12.10.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=19ec6a4fb399c3dcac5c9ee0623d3e95
+_md5_=375cab2de5544331fe8f23054e6f7025
diff --git a/metadata/md5-cache/dev-ros/collada_parser-9999 b/metadata/md5-cache/dev-ros/collada_parser-9999
index a162b639e91b..fa235abeb206 100644
--- a/metadata/md5-cache/dev-ros/collada_parser-9999
+++ b/metadata/md5-cache/dev-ros/collada_parser-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/roscpp dev-ros/class_loader dev-libs/urdfdom_headers dev-libs/collada-dom >=dev-ros/urdf-1.12.6 dev-libs/console_bridge:= >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/roscpp dev-ros/class_loader dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-libs/console_bridge:= >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=C++ parser for the Collada robot description format
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/collada_parser
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/roscpp dev-ros/class_loader dev-libs/urdfdom_headers dev-libs/collada-dom >=dev-ros/urdf-1.12.6 dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/roscpp dev-ros/class_loader dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=19ec6a4fb399c3dcac5c9ee0623d3e95
+_md5_=375cab2de5544331fe8f23054e6f7025
diff --git a/metadata/md5-cache/dev-ros/collada_urdf-1.12.10 b/metadata/md5-cache/dev-ros/collada_urdf-1.12.10-r1
index dba7d39d6fcb..f34c787544d0 100644
--- a/metadata/md5-cache/dev-ros/collada_urdf-1.12.10
+++ b/metadata/md5-cache/dev-ros/collada_urdf-1.12.10-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/urdf dev-ros/geometric_shapes dev-ros/tf media-libs/assimp dev-libs/tinyxml dev-libs/collada-dom sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/urdf dev-ros/geometric_shapes dev-ros/tf media-libs/assimp dev-libs/tinyxml dev-libs/collada-dom:= sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Convert Unified Robot Description Format (URDF) documents into COLLADA documents
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/collada_urdf
 IUSE=python_targets_python2_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/urdf dev-ros/geometric_shapes dev-ros/tf media-libs/assimp dev-libs/tinyxml dev-libs/collada-dom python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/urdf dev-ros/geometric_shapes dev-ros/tf media-libs/assimp dev-libs/tinyxml dev-libs/collada-dom:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros/collada_urdf/archive/1.12.10.tar.gz -> collada_urdf-1.12.10.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=57998a8f57dcb268da8de72a2898df84
+_md5_=e304874dde49a10c0f9b435600cd2c2a
diff --git a/metadata/md5-cache/dev-ros/collada_urdf-9999 b/metadata/md5-cache/dev-ros/collada_urdf-9999
index 3bf82d41565b..dca95f650109 100644
--- a/metadata/md5-cache/dev-ros/collada_urdf-9999
+++ b/metadata/md5-cache/dev-ros/collada_urdf-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/urdf dev-ros/geometric_shapes dev-ros/tf media-libs/assimp dev-libs/tinyxml dev-libs/collada-dom >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/urdf dev-ros/geometric_shapes dev-ros/tf media-libs/assimp dev-libs/tinyxml dev-libs/collada-dom:= >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Convert Unified Robot Description Format (URDF) documents into COLLADA documents
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/collada_urdf
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/urdf dev-ros/geometric_shapes dev-ros/tf media-libs/assimp dev-libs/tinyxml dev-libs/collada-dom python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/urdf dev-ros/geometric_shapes dev-ros/tf media-libs/assimp dev-libs/tinyxml dev-libs/collada-dom:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=57998a8f57dcb268da8de72a2898df84
+_md5_=e304874dde49a10c0f9b435600cd2c2a
diff --git a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.2 b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.2
new file mode 100644
index 000000000000..0091f28e9a02
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Interactive marker tutorials
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/interactive_marker_tutorials
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.2.tar.gz -> visualization_tutorials-0.10.2.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=27cbba0feb39dede9b76c320f9605c26
diff --git a/metadata/md5-cache/dev-ros/librviz_tutorial-0.10.2 b/metadata/md5-cache/dev-ros/librviz_tutorial-0.10.2
new file mode 100644
index 000000000000..742f005fa7b4
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/librviz_tutorial-0.10.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Tutorial showing how to compile your own C++ program with RViz displays and features
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/librviz_tutorial
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.2.tar.gz -> visualization_tutorials-0.10.2.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=05f19ad785517ddaf2bf92376e218a86
diff --git a/metadata/md5-cache/dev-ros/rviz-1.12.15 b/metadata/md5-cache/dev-ros/rviz-1.12.15
new file mode 100644
index 000000000000..cbb68b1a3973
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rviz-1.12.15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:=[threads] media-libs/assimp dev-games/ogre virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp dev-libs/urdfdom:= dev-libs/tinyxml:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules virtual/pkgconfig test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=3D visualization tool for ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rviz
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-libs/boost:=[threads] media-libs/assimp dev-games/ogre virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp dev-libs/urdfdom:= dev-libs/tinyxml:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rviz/archive/1.12.15.tar.gz -> rviz-1.12.15.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=26f4ed168e849e973a48dee7d614290d
diff --git a/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.10.2 b/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.10.2
new file mode 100644
index 000000000000..8cb6b738efb3
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.10.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rviz dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Tutorials showing how to write plugins for RViz
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rviz_plugin_tutorials
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/rviz dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.2.tar.gz -> visualization_tutorials-0.10.2.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7eb6ca877ed8cef3e880bfba086701a9
diff --git a/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.10.2 b/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.10.2
new file mode 100644
index 000000000000..50da9af5061b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.10.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Tutorials showing how to call into rviz internals from python scripts
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/rviz_python_tutorial
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/rviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.2.tar.gz -> visualization_tutorials-0.10.2.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=26adc53fc21624f57e75cc08cdf0fca8
diff --git a/metadata/md5-cache/dev-ros/test_tf2-0.5.17 b/metadata/md5-cache/dev-ros/test_tf2-0.5.17
new file mode 100644
index 000000000000..086704770225
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_tf2-0.5.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_msgs sci-libs/orocos_kdl dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-cpp/gtest sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=TF2 unit tests
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/test_tf2
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry2/archive/0.5.17.tar.gz -> geometry2-0.5.17.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=97b7d02b0224faee8b1964a9a5e532a8
diff --git a/metadata/md5-cache/dev-ros/tf2-0.5.17 b/metadata/md5-cache/dev-ros/tf2-0.5.17
new file mode 100644
index 000000000000..47c90600437d
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/tf2-0.5.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-libs/console_bridge:= dev-ros/rostime dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-ros/roscpp ) sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=The second generation Transform Library in ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/tf2
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-libs/console_bridge:= dev-ros/rostime dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-libs/boost:=[threads] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry2/archive/0.5.17.tar.gz -> geometry2-0.5.17.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=903cb9fb1a430b56a6d528385712492f
diff --git a/metadata/md5-cache/dev-ros/tf2_bullet-0.5.17 b/metadata/md5-cache/dev-ros/tf2_bullet-0.5.17
new file mode 100644
index 000000000000..af51698960b8
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/tf2_bullet-0.5.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-physics/bullet sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=TF2 bullet support
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/tf2_bullet
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-physics/bullet python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry2/archive/0.5.17.tar.gz -> geometry2-0.5.17.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b98c149c6a03ef150ae8e58a31297e6d
diff --git a/metadata/md5-cache/dev-ros/tf2_eigen-0.5.17 b/metadata/md5-cache/dev-ros/tf2_eigen-0.5.17
new file mode 100644
index 000000000000..84e4e237f66b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/tf2_eigen-0.5.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=TF2 eigen support
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/tf2_eigen
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry2/archive/0.5.17.tar.gz -> geometry2-0.5.17.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5b07a52e31b6d2c92ed349b150972a04
diff --git a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.5.17 b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.5.17
new file mode 100644
index 000000000000..9f5c4fefc9d8
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.5.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=The second generation Transform Library in ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/tf2_geometry_msgs
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry2/archive/0.5.17.tar.gz -> geometry2-0.5.17.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=436e48b3a2d87635ae89594e1904b6d7
diff --git a/metadata/md5-cache/dev-ros/tf2_kdl-0.5.17 b/metadata/md5-cache/dev-ros/tf2_kdl-0.5.17
new file mode 100644
index 000000000000..87bacbcc96ed
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/tf2_kdl-0.5.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/tf2_ros dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/orocos_kdl dev-ros/tf2_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cmake_modules test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=KDL binding for tf2
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/tf2_kdl
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/tf2_ros dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/orocos_kdl dev-ros/tf2_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cmake_modules python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry2/archive/0.5.17.tar.gz -> geometry2-0.5.17.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bbee13551ad4a45936fcbb21af5c4db2
diff --git a/metadata/md5-cache/dev-ros/tf2_msgs-0.5.17 b/metadata/md5-cache/dev-ros/tf2_msgs-0.5.17
new file mode 100644
index 000000000000..9b890a3de65a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/tf2_msgs-0.5.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=TF2 messages
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/tf2_msgs
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry2/archive/0.5.17.tar.gz -> geometry2-0.5.17.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1f7d02ccefcef938994af37687c28169
diff --git a/metadata/md5-cache/dev-ros/tf2_py-0.5.17 b/metadata/md5-cache/dev-ros/tf2_py-0.5.17
new file mode 100644
index 000000000000..d5c9650a9475
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/tf2_py-0.5.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=TF2 python bindings
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/tf2_py
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry2/archive/0.5.17.tar.gz -> geometry2-0.5.17.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f986121d666943996636ab6b35a4f37b
diff --git a/metadata/md5-cache/dev-ros/tf2_ros-0.5.17 b/metadata/md5-cache/dev-ros/tf2_ros-0.5.17
new file mode 100644
index 000000000000..0c7d83ddd310
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/tf2_ros-0.5.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=ROS bindings for the tf2 library, for both Python and C++
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/tf2_ros
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry2/archive/0.5.17.tar.gz -> geometry2-0.5.17.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=afa831cde909d3269273a91f4d0bec1f
diff --git a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.5.17 b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.5.17
new file mode 100644
index 000000000000..72a72414e55a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.5.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Transform sensor_msgs with tf. Most notably, PointCloud2
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/tf2_sensor_msgs
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry2/archive/0.5.17.tar.gz -> geometry2-0.5.17.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2f1a014de557c97b109bf7652e7b6177
diff --git a/metadata/md5-cache/dev-ros/tf2_tools-0.5.17 b/metadata/md5-cache/dev-ros/tf2_tools-0.5.17
new file mode 100644
index 000000000000..89ec328c4e68
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/tf2_tools-0.5.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=TF2 tools
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/tf2_tools
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry2/archive/0.5.17.tar.gz -> geometry2-0.5.17.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cb18bbdbe42cb60ec85852a7bae6ba72
diff --git a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.10.2 b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.10.2
new file mode 100644
index 000000000000..25e214ad8f01
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.10.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Visualization marker tutorials
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/visualization_marker_tutorials
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.2.tar.gz -> visualization_tutorials-0.10.2.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5e67cd4682f928841e33af43086edb2c
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 6b74915efbea..a09707da506c 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3 b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
index ab56265d6336..e99c80664a86 100644
--- a/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
+++ b/metadata/md5-cache/dev-ruby/abstract-1.0.0-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=Library which enable you to define abstract method in Ruby
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/abstract
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
 KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=Ruby
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/abstract-1.0.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ceaa089ea6a6c29c46c0f8bc5d8b7c62
+_md5_=8551071e04e352e99c9b2af77e7b8796
diff --git a/metadata/md5-cache/dev-ruby/minitest-5.11.1 b/metadata/md5-cache/dev-ruby/minitest-5.11.1
new file mode 100644
index 000000000000..7b6c276fbed5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/minitest-5.11.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=minitest/unit is a small and fast replacement for ruby's huge and slow test/unit
+EAPI=6
+HOMEPAGE=https://github.com/seattlerb/minitest
+IUSE=doc test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=5
+SRC_URI=mirror://rubygems/minitest-5.11.1.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=0bd8985587a63e3efaadc63cdcb70203
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.7.1 b/metadata/md5-cache/dev-ruby/rspec-core-3.7.1
new file mode 100644
index 000000000000..99892d490199
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.7.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.7*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.7*[ruby_targets_ruby23] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby23] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.7*[ruby_targets_ruby24] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby24] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby24] ) ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby23] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby23] dev-ruby/syntax[ruby_targets_ruby23] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby23] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby23] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby24] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby24] dev-ruby/syntax[ruby_targets_ruby24] >=dev-ruby/thread_order-1.1.0[ruby_targets_ruby24] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby24] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=A Behaviour Driven Development (BDD) framework for Ruby
+EAPI=6
+HOMEPAGE=https://github.com/rspec/rspec-core
+IUSE=highlight test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.7*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( =dev-ruby/rspec-support-3.7*[ruby_targets_ruby23] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby23] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( =dev-ruby/rspec-support-3.7*[ruby_targets_ruby24] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby24] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=3
+SRC_URI=https://github.com/rspec/rspec-core/archive/v3.7.1.tar.gz -> rspec-core-3.7.1-git.tgz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=72690f0648aed4b51ea05c0fe600ba28
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index bf7a3a82366d..3106d5666eb0 100644
--- a/metadata/md5-cache/dev-scheme/Manifest.gz
+++ b/metadata/md5-cache/dev-scheme/Manifest.gz
diff --git a/metadata/md5-cache/dev-scheme/guile-lib-0.2.4 b/metadata/md5-cache/dev-scheme/guile-lib-0.2.4
index 3cd1f6cca41a..114f33ccdbd2 100644
--- a/metadata/md5-cache/dev-scheme/guile-lib-0.2.4
+++ b/metadata/md5-cache/dev-scheme/guile-lib-0.2.4
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-scheme/guile-2.0.12[regex,deprecated]
 SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/guile-lib/guile-lib-0.2.4.tar.gz
-_md5_=d49c16915ce066fb023450f9f54240a6
+SRC_URI=http://download.savannah.gnu.org/releases/guile-lib/old/guile-lib-0.2.4.tar.gz
+_md5_=6fb9069edf1d2811c65c6b84091619f9
diff --git a/metadata/md5-cache/dev-scheme/guile-lib-0.2.5.1 b/metadata/md5-cache/dev-scheme/guile-lib-0.2.5.1
new file mode 100644
index 000000000000..a148cca52c71
--- /dev/null
+++ b/metadata/md5-cache/dev-scheme/guile-lib-0.2.5.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-scheme/guile-2.0.12[regex,deprecated] !<dev-libs/g-wrap-1.9.8
+DESCRIPTION=An accumulation place for pure-scheme Guile modules
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/guile-lib/
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-scheme/guile-2.0.12[regex,deprecated]
+SLOT=0
+SRC_URI=http://download.savannah.gnu.org/releases/guile-lib/guile-lib-0.2.5.1.tar.gz
+_md5_=95d4295fbdc1abfa9a9e0036c97146ee
diff --git a/metadata/md5-cache/dev-tex/Manifest.gz b/metadata/md5-cache/dev-tex/Manifest.gz
index 22e895e2eaf3..b7004b553ede 100644
--- a/metadata/md5-cache/dev-tex/Manifest.gz
+++ b/metadata/md5-cache/dev-tex/Manifest.gz
diff --git a/metadata/md5-cache/dev-tex/cpp2latex-2.3-r1 b/metadata/md5-cache/dev-tex/cpp2latex-2.3-r1
deleted file mode 100644
index 48c139af84ab..000000000000
--- a/metadata/md5-cache/dev-tex/cpp2latex-2.3-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=A program to convert C++ code to LaTeX source
-EAPI=0
-HOMEPAGE=http://www.arnoldarts.de/drupal/?q=Cpp2LaTeX
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.arnoldarts.de/drupal/files/downloads/cpp2latex/cpp2latex-2.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2a2bdfeade919327d1d356b71e84fd0d
diff --git a/metadata/md5-cache/dev-tex/pstplus-1.6 b/metadata/md5-cache/dev-tex/pstplus-1.6
index a72b6fe9cfc0..867a5b58b870 100644
--- a/metadata/md5-cache/dev-tex/pstplus-1.6
+++ b/metadata/md5-cache/dev-tex/pstplus-1.6
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=dev-qt/qtgui:4 dev-qt/qtcore:4 app-text/poppler[qt4]
+DEPEND=dev-qt/qtgui:4 dev-qt/qtcore:4 <app-text/poppler-0.62.0[qt4]
 DESCRIPTION=A PSTricks GUI
 EAPI=4
 HOMEPAGE=http://www.xm1math.net/pstplus/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:4 dev-qt/qtcore:4 app-text/poppler[qt4] virtual/latex-base dev-texlive/texlive-pstricks app-text/psutils sci-visualization/gnuplot app-text/ghostscript-gpl media-libs/netpbm
+RDEPEND=dev-qt/qtgui:4 dev-qt/qtcore:4 <app-text/poppler-0.62.0[qt4] virtual/latex-base dev-texlive/texlive-pstricks app-text/psutils sci-visualization/gnuplot app-text/ghostscript-gpl media-libs/netpbm
 SLOT=0
 SRC_URI=http://www.xm1math.net/pstplus/pstplus-1.6.tar.bz2
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9948e980c18df068ddef77ab89b77880
+_md5_=103c357e6ce1057e5c866482d101f6c4
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 4d784bee573e..0c17a6eec44d 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/ignition-cmake-0.2.0 b/metadata/md5-cache/dev-util/ignition-cmake-0.2.0
new file mode 100644
index 000000000000..cea5b6c13a12
--- /dev/null
+++ b/metadata/md5-cache/dev-util/ignition-cmake-0.2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=CMake modules to be used by the Ignition projects.
+EAPI=6
+HOMEPAGE=https://bitbucket.org/ignitionrobotics/ign-cmake
+IUSE=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=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://osrf-distributions.s3.amazonaws.com/ign-cmake/releases/ignition-cmake-0.2.0.tar.bz2
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1a57037bbc779008f86219a96780df6c
diff --git a/metadata/md5-cache/dev-util/xfce4-dev-tools-4.12.0-r1 b/metadata/md5-cache/dev-util/xfce4-dev-tools-4.12.0-r1
index abd383ea8ed0..a0335719714b 100644
--- a/metadata/md5-cache/dev-util/xfce4-dev-tools-4.12.0-r1
+++ b/metadata/md5-cache/dev-util/xfce4-dev-tools-4.12.0-r1
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/glib-2.30 virtual/pkgconfig
 DESCRIPTION=A set of scripts and m4/autoconf macros that ease build system maintenance
 EAPI=6
 HOMEPAGE=https://www.xfce.org/ http://users.xfce.org/~benny/projects/xfce4-dev-tools/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.30
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/xfce4-dev-tools/4.12/xfce4-dev-tools-4.12.0.tar.bz2
-_md5_=c0881ca4ff7dc2777bae8854425e6ad3
+_md5_=e3b1c190462fe4eba7773b7c582279cb
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index e941f9c57387..95468681901f 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/qct-1.7-r2 b/metadata/md5-cache/dev-vcs/qct-1.7-r2
deleted file mode 100644
index cb8fc5f1819d..000000000000
--- a/metadata/md5-cache/dev-vcs/qct-1.7-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-text/asciidoc app-text/xmlto dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] bazaar? ( dev-vcs/bzr[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) cvs? ( dev-vcs/cvs ) mercurial? ( dev-vcs/mercurial[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) monotone? ( dev-vcs/monotone ) subversion? ( dev-vcs/subversion[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
-DESCRIPTION=PyQt based commit tool for many VCSs
-EAPI=6
-HOMEPAGE=http://qct.sourceforge.net/
-IUSE=bazaar cvs mercurial monotone subversion python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-text/asciidoc app-text/xmlto dev-python/PyQt4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] bazaar? ( dev-vcs/bzr[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) cvs? ( dev-vcs/cvs ) mercurial? ( dev-vcs/mercurial[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) monotone? ( dev-vcs/monotone ) subversion? ( dev-vcs/subversion[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://qct.sourceforge.net/qct-1.7.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6bdc16e20e42feb7a0f830907f76d080
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index 4361586c95b9..4544214736ae 100644
--- a/metadata/md5-cache/games-server/Manifest.gz
+++ b/metadata/md5-cache/games-server/Manifest.gz
diff --git a/metadata/md5-cache/games-server/nwn-ded-1.69-r1 b/metadata/md5-cache/games-server/nwn-ded-1.69-r1
index d8d254209c9e..74e2e3c3f3e1 100644
--- a/metadata/md5-cache/games-server/nwn-ded-1.69-r1
+++ b/metadata/md5-cache/games-server/nwn-ded-1.69-r1
@@ -3,11 +3,11 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Neverwinter Nights Dedicated server
 EAPI=6
 HOMEPAGE=http://nwn.bioware.com/downloads/standaloneserver.html
-IUSE=linguas_en
+IUSE=l10n_en
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=NWN-EULA
 RESTRICT=mirror strip
 SLOT=0
-SRC_URI=http://files.bioware.com/neverwinternights/updates/windows/server/NWNDedicatedServer1.69.zip linguas_en? ( http://files.bioware.com/neverwinternights/dialog//english/NWNEnglish1.69dialog.zip )
+SRC_URI=http://files.bioware.com/neverwinternights/updates/windows/server/NWNDedicatedServer1.69.zip l10n_en? ( http://files.bioware.com/neverwinternights/dialog//english/NWNEnglish1.69dialog.zip )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=32baff14001c548bd5ff30448e2601ab
+_md5_=f59fdb65c6eb0bd6407a57c84a4b44c6
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 9605e2a0a278..21191a67d9eb 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/ja2-stracciatella-0.12.1_p7072 b/metadata/md5-cache/games-strategy/ja2-stracciatella-0.12.1_p7072
index 355f1d2774b7..9214c6d011c5 100644
--- a/metadata/md5-cache/games-strategy/ja2-stracciatella-0.12.1_p7072
+++ b/metadata/md5-cache/games-strategy/ja2-stracciatella-0.12.1_p7072
@@ -3,12 +3,12 @@ DEPEND=media-libs/libsdl[X,sound,video] zlib? ( sys-libs/zlib )
 DESCRIPTION=A port of Jagged Alliance 2 to SDL
 EAPI=5
 HOMEPAGE=https://ja2-stracciatella.github.io/
-IUSE=cdinstall editor zlib linguas_de +linguas_en linguas_fr linguas_it linguas_nl linguas_pl linguas_ru linguas_ru_gold
+IUSE=cdinstall editor ru-gold zlib l10n_de +l10n_en l10n_fr l10n_it l10n_nl l10n_pl l10n_ru
 KEYWORDS=~amd64 ~x86
 LICENSE=SFI-SCLA
 RDEPEND=media-libs/libsdl[X,sound,video] zlib? ( sys-libs/zlib ) cdinstall? ( games-strategy/ja2-stracciatella-data ) games-misc/games-envd
-REQUIRED_USE=^^ ( linguas_de linguas_en linguas_fr linguas_it linguas_nl linguas_pl linguas_ru linguas_ru_gold )
+REQUIRED_USE=^^ ( l10n_de l10n_en l10n_fr l10n_it l10n_nl l10n_pl l10n_ru )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~hasufell/distfiles/ja2-stracciatella-0.12.1_p7072.tar.xz http://tron.homeunix.org/ja2/editor.slf.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=a836c4e3177fbbcfa0c6772754867740
+_md5_=086b7aaf5ca83848d553811f45b09f84
diff --git a/metadata/md5-cache/gnustep-apps/Manifest.gz b/metadata/md5-cache/gnustep-apps/Manifest.gz
index 242cbc86fb97..f43a9bac3a39 100644
--- a/metadata/md5-cache/gnustep-apps/Manifest.gz
+++ b/metadata/md5-cache/gnustep-apps/Manifest.gz
diff --git a/metadata/md5-cache/gnustep-apps/cenon-4.0.2-r1 b/metadata/md5-cache/gnustep-apps/cenon-4.0.2-r1
index e2cc492cc2c0..7eebfdac5940 100644
--- a/metadata/md5-cache/gnustep-apps/cenon-4.0.2-r1
+++ b/metadata/md5-cache/gnustep-apps/cenon-4.0.2-r1
@@ -8,6 +8,6 @@ KEYWORDS=amd64 ppc x86
 LICENSE=Cenon
 RDEPEND=>=gnustep-libs/cenonlibrary-4.0.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
-SRC_URI=http://www.vhf-group.com/vhf-interservice/download/source/Cenon-4.0.2.tar.bz2
+SRC_URI=http://www.cenon.zone/download/source/Cenon-4.0.2.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6abc8afb487b7ae929a7005b23954f4d
+_md5_=d30ea5d78197be28e1a0942537b6f19c
diff --git a/metadata/md5-cache/gnustep-libs/Manifest.gz b/metadata/md5-cache/gnustep-libs/Manifest.gz
index d7ca5205b582..28f94d6cb52c 100644
--- a/metadata/md5-cache/gnustep-libs/Manifest.gz
+++ b/metadata/md5-cache/gnustep-libs/Manifest.gz
diff --git a/metadata/md5-cache/gnustep-libs/cenonlibrary-4.0.0 b/metadata/md5-cache/gnustep-libs/cenonlibrary-4.0.0
index 51fc925a9abd..9d02ce66246a 100644
--- a/metadata/md5-cache/gnustep-libs/cenonlibrary-4.0.0
+++ b/metadata/md5-cache/gnustep-libs/cenonlibrary-4.0.0
@@ -8,6 +8,6 @@ KEYWORDS=amd64 ppc x86
 LICENSE=Cenon
 RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
 SLOT=0
-SRC_URI=http://www.vhf-group.com/vhf-interservice/download/source/CenonLibrary-4.0.0-1.tar.bz2
+SRC_URI=http://www.cenon.zone/download/source/CenonLibrary-4.0.0-1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1ca2284715c5884d8dc58553dbda236f
+_md5_=a4417d91ff125973a2dd9162f2ed13ef
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 192d85c82674..d12d8cce1b59 100644
--- a/metadata/md5-cache/kde-misc/Manifest.gz
+++ b/metadata/md5-cache/kde-misc/Manifest.gz
diff --git a/metadata/md5-cache/kde-misc/latte-dock-0.7.1 b/metadata/md5-cache/kde-misc/latte-dock-0.7.3
index 4d2039bfc475..b42e1cbd4ba1 100644
--- a/metadata/md5-cache/kde-misc/latte-dock-0.7.1
+++ b/metadata/md5-cache/kde-misc/latte-dock-0.7.3
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=kde-frameworks/kactivities-5.40.0 >=kde-frameworks/karchive-5.40.0 >=kde-frameworks/kconfig-5.40.0 >=kde-frameworks/kcoreaddons-5.40.0 >=kde-frameworks/kcrash-5.40.0 >=kde-frameworks/kdbusaddons-5.40.0 >=kde-frameworks/kdeclarative-5.40.0 >=kde-frameworks/kglobalaccel-5.40.0 >=kde-frameworks/ki18n-5.40.0 >=kde-frameworks/kiconthemes-5.40.0 >=kde-frameworks/knotifications-5.40.0 >=kde-frameworks/kpackage-5.40.0 >=kde-frameworks/kwayland-5.40.0 >=kde-frameworks/kwindowsystem-5.40.0 >=kde-frameworks/kxmlgui-5.40.0 >=kde-frameworks/plasma-5.40.0[X] >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[xcb] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/extra-cmake-modules-5.40.0 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=kde-frameworks/kactivities-5.40.0 >=kde-frameworks/karchive-5.40.0 >=kde-frameworks/kconfig-5.40.0 >=kde-frameworks/kcoreaddons-5.40.0 >=kde-frameworks/kcrash-5.40.0 >=kde-frameworks/kdbusaddons-5.40.0 >=kde-frameworks/kdeclarative-5.40.0 >=kde-frameworks/kglobalaccel-5.40.0 >=kde-frameworks/ki18n-5.40.0 >=kde-frameworks/kiconthemes-5.40.0 >=kde-frameworks/knewstuff-5.40.0 >=kde-frameworks/knotifications-5.40.0 >=kde-frameworks/kpackage-5.40.0 >=kde-frameworks/kwayland-5.40.0 >=kde-frameworks/kwindowsystem-5.40.0 >=kde-frameworks/kxmlgui-5.40.0 >=kde-frameworks/plasma-5.40.0[X] >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[xcb] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-frameworks/extra-cmake-modules-5.40.0 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
 DESCRIPTION=Elegant dock, based on KDE Frameworks
 EAPI=6
 HOMEPAGE=https://store.kde.org/p/1169519/ https://github.com/psifidotos/Latte-Dock
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kactivities-5.40.0 >=kde-frameworks/karchive-5.40.0 >=kde-frameworks/kconfig-5.40.0 >=kde-frameworks/kcoreaddons-5.40.0 >=kde-frameworks/kcrash-5.40.0 >=kde-frameworks/kdbusaddons-5.40.0 >=kde-frameworks/kdeclarative-5.40.0 >=kde-frameworks/kglobalaccel-5.40.0 >=kde-frameworks/ki18n-5.40.0 >=kde-frameworks/kiconthemes-5.40.0 >=kde-frameworks/knotifications-5.40.0 >=kde-frameworks/kpackage-5.40.0 >=kde-frameworks/kwayland-5.40.0 >=kde-frameworks/kwindowsystem-5.40.0 >=kde-frameworks/kxmlgui-5.40.0 >=kde-frameworks/plasma-5.40.0[X] >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[xcb] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb
+RDEPEND=>=kde-frameworks/kactivities-5.40.0 >=kde-frameworks/karchive-5.40.0 >=kde-frameworks/kconfig-5.40.0 >=kde-frameworks/kcoreaddons-5.40.0 >=kde-frameworks/kcrash-5.40.0 >=kde-frameworks/kdbusaddons-5.40.0 >=kde-frameworks/kdeclarative-5.40.0 >=kde-frameworks/kglobalaccel-5.40.0 >=kde-frameworks/ki18n-5.40.0 >=kde-frameworks/kiconthemes-5.40.0 >=kde-frameworks/knewstuff-5.40.0 >=kde-frameworks/knotifications-5.40.0 >=kde-frameworks/kpackage-5.40.0 >=kde-frameworks/kwayland-5.40.0 >=kde-frameworks/kwindowsystem-5.40.0 >=kde-frameworks/kxmlgui-5.40.0 >=kde-frameworks/plasma-5.40.0[X] >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[xcb] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb
 SLOT=0
-SRC_URI=https://github.com/psifidotos/Latte-Dock/archive/v0.7.1.tar.gz -> latte-dock-0.7.1.tar.gz
+SRC_URI=mirror://kde/stable/latte-dock/latte-dock-0.7.3.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3dce10a87f92369bb2356828b38c059b
+_md5_=0cbafb291283effbb63373f40a788534
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 69202a04d606..5c883d70a1b6 100644
--- a/metadata/md5-cache/mail-client/Manifest.gz
+++ b/metadata/md5-cache/mail-client/Manifest.gz
diff --git a/metadata/md5-cache/mail-client/mutt-1.9.2-r1 b/metadata/md5-cache/mail-client/mutt-1.9.2-r2
index 221bfb5db28a..67d6410b6848 100644
--- a/metadata/md5-cache/mail-client/mutt-1.9.2-r1
+++ b/metadata/md5-cache/mail-client/mutt-1.9.2-r2
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=app-misc/mime-types berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0:= ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) notmuch? ( net-mail/notmuch:= ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) selinux? ( sec-policy/selinux-mutt ) smime? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) smime_classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) crypt? ( app-crypt/gnupg ) pgp_classic? ( app-crypt/gnupg )
 REQUIRED_USE=hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) nntp? ( ssl ) smime? ( ssl !gnutls ) smime_classic? ( ssl !gnutls ) smtp? ( ssl ) sasl? ( || ( imap pop smtp nntp ) ) kerberos? ( || ( imap pop smtp nntp ) )
 SLOT=0
-SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-1.9.2.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-1.9.2.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.9.2-patches-r1.tar.xz
+SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-1.9.2.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-1.9.2.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.9.2-patches-r2.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4c24659ca660fe1b9492e305e861a016
+_md5_=e30ed7b4173bbfb16f3000145ea8c474
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 45c6d60c59bb..9bf71abe20f7 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/dcraw-9.27.0 b/metadata/md5-cache/media-gfx/dcraw-9.27.0
index 9759f6039032..6ee11868dc55 100644
--- a/metadata/md5-cache/media-gfx/dcraw-9.27.0
+++ b/metadata/md5-cache/media-gfx/dcraw-9.27.0
@@ -3,11 +3,11 @@ DEPEND=jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) jpeg2k? ( media-libs
 DESCRIPTION=Command-line decoder for raw digital photos
 EAPI=5
 HOMEPAGE=https://www.cybercom.net/~dcoffin/dcraw/
-IUSE=nls gimp jpeg jpeg2k lcms linguas_ca linguas_cs linguas_de linguas_da linguas_eo linguas_es linguas_fr linguas_hu linguas_it linguas_nl linguas_pl linguas_pt linguas_ru linguas_sv linguas_zh_CN linguas_zh_TW
+IUSE=nls gimp jpeg jpeg2k lcms
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) jpeg2k? ( media-libs/jasper:= ) gimp? ( media-gfx/gimp ) media-libs/netpbm
 SLOT=0
 SRC_URI=https://www.cybercom.net/~dcoffin/dcraw/archive/dcraw-9.27.0.tar.gz mirror://gentoo/parse-1.73.tar.bz2 gimp? ( mirror://gentoo/rawphoto-1.32.tar.bz2 )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo	589f4c6d735919e293942dd66311dc40	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f4a57028b2dcd45df45fcfff090ccbef
+_md5_=33beb6908515848105f28fa01733463e
diff --git a/metadata/md5-cache/media-gfx/graphviz-2.40.1-r1 b/metadata/md5-cache/media-gfx/graphviz-2.40.1-r1
new file mode 100644
index 000000000000..f10794000a79
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/graphviz-2.40.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl:0 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] >=media-libs/libpng-1.2:0 sys-libs/zlib virtual/jpeg:0 virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:0= ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) sys-devel/flex sys-devel/libtool virtual/pkgconfig guile? ( dev-lang/swig dev-scheme/guile ) java? ( dev-lang/swig >=virtual/jdk-1.5 ) nls? ( >=sys-devel/gettext-0.14.5 ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) >=app-portage/elt-patches-20170422 !<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 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Open Source Graph Visualization Software
+EAPI=6
+HOMEPAGE=https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/
+IUSE=+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD elibc_FreeBSD java python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+LICENSE=CPL-1.0
+RDEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl:0 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] >=media-libs/libpng-1.2:0 sys-libs/zlib virtual/jpeg:0 virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:0= ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) !<=sci-chemistry/cluster-1.3.081231 java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=!cairo? ( !X !gtk !postscript !lasi ) python? ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.40.1.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=65f0e63377fddb6c12ecccbc1b265ee2
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.9.31 b/metadata/md5-cache/media-gfx/imagemagick-6.9.9.31
index 73d7f4277f8a..4165c1751825 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.9.31
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.9.31
@@ -4,7 +4,7 @@ DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=6
 HOMEPAGE=http://www.imagemagick.org/
 IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
@@ -12,4 +12,4 @@ RESTRICT=perl? ( userpriv )
 SLOT=0/6.9.9.31
 SRC_URI=mirror://imagemagick/ImageMagick-6.9.9-31.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=898e1cac0cece5a87596c6d4e03a43d6
+_md5_=5bc636c708f29201f5ad18c43ca16b00
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.7.19 b/metadata/md5-cache/media-gfx/imagemagick-7.0.7.19
index 10d8d86532a9..2bc0831cead3 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.7.19
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.0.7.19
@@ -4,7 +4,7 @@ DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=6
 HOMEPAGE=http://www.imagemagick.org/
 IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
@@ -12,4 +12,4 @@ RESTRICT=perl? ( userpriv )
 SLOT=0/7.0.7.19
 SRC_URI=mirror://imagemagick/ImageMagick-7.0.7-19.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=26eef89db321dbeb57629bbdb39fc096
+_md5_=a03f3b0cfd1c7f36048e8435b1be31bb
diff --git a/metadata/md5-cache/media-gfx/iscan-plugin-gt-f720-0.0.1 b/metadata/md5-cache/media-gfx/iscan-plugin-gt-f720-0.0.1
index ac4342a2bb1f..8fbb276656f1 100644
--- a/metadata/md5-cache/media-gfx/iscan-plugin-gt-f720-0.0.1
+++ b/metadata/md5-cache/media-gfx/iscan-plugin-gt-f720-0.0.1
@@ -3,11 +3,10 @@ DEPEND=>=media-gfx/iscan-2.21.0 >=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=Epson Perfection V300 PHOTO scanner plugin for SANE 'epkowa' backend
 EAPI=2
 HOMEPAGE=http://www.avasys.jp/english/linux_e/dl_scan.html
-IUSE=linguas_ja
 KEYWORDS=amd64 x86
 LICENSE=AVASYS
 RDEPEND=>=media-gfx/iscan-2.21.0
 SLOT=0
 SRC_URI=x86? ( http://linux.avasys.jp/drivers/scanner-plugins/GT-F720/esci-interpreter-gt-f720-0.0.1-2.i386.rpm ) amd64? ( http://linux.avasys.jp/drivers/scanner-plugins/GT-F720/esci-interpreter-gt-f720-0.0.1-2.x86_64.rpm )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ee6dcad16b8bc5ad034e0d5251bd4dba
+_md5_=c867b6d0ec1c280b37ce1415c21c971a
diff --git a/metadata/md5-cache/media-gfx/iscan-plugin-gt-f720-0.0.1.2 b/metadata/md5-cache/media-gfx/iscan-plugin-gt-f720-0.0.1.2
index 72d451d7eb55..9a09d61c6c96 100644
--- a/metadata/md5-cache/media-gfx/iscan-plugin-gt-f720-0.0.1.2
+++ b/metadata/md5-cache/media-gfx/iscan-plugin-gt-f720-0.0.1.2
@@ -3,11 +3,10 @@ DEPEND=>=media-gfx/iscan-2.21.0 >=app-arch/rpm2targz-9.0.0.3g
 DESCRIPTION=Epson Perfection V300 PHOTO scanner plugin for SANE 'epkowa' backend
 EAPI=4
 HOMEPAGE=http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
-IUSE=linguas_ja
 KEYWORDS=-* amd64 x86
 LICENSE=AVASYS
 RDEPEND=>=media-gfx/iscan-2.21.0
 SLOT=0
 SRC_URI=amd64? ( https://dev.gentoo.org/~flameeyes/avasys/esci-interpreter-gt-f720-0.0.1-2.x86_64.rpm ) x86? ( https://dev.gentoo.org/~flameeyes/avasys/esci-interpreter-gt-f720-0.0.1-2.i386.rpm )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	rpm	f52cfa3a435468d86d3b49c357b9cb35	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=5a1f59fda0eb10ea37a3295f520af3f3
+_md5_=aa24bf4186df7925959673de34c237e7
diff --git a/metadata/md5-cache/media-gfx/valentina-0.5.0-r2 b/metadata/md5-cache/media-gfx/valentina-0.5.0-r2
index fb3b2fbe56d6..fda5e2435a4e 100644
--- a/metadata/md5-cache/media-gfx/valentina-0.5.0-r2
+++ b/metadata/md5-cache/media-gfx/valentina-0.5.0-r2
@@ -3,11 +3,11 @@ DEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt
 DESCRIPTION=Cloth patternmaking software
 EAPI=6
 HOMEPAGE=https://valentinaproject.bitbucket.io/
-IUSE=gnome linguas_cs_CZ linguas_de_DE linguas_el_GR linguas_en_CA linguas_en_US linguas_es_ES linguas_fi_FI linguas_fr_FR linguas_he_IL linguas_id_ID linguas_it_IT linguas_nl_NL linguas_pt_BR linguas_ro_RO linguas_ru_RU linguas_uk_UA linguas_zh_CN
+IUSE=gnome l10n_cs l10n_de l10n_el l10n_en l10n_en l10n_es l10n_fi l10n_fr l10n_he l10n_id l10n_it l10n_nl l10n_pt-BR l10n_ro l10n_ru l10n_uk l10n_zh-CN
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
 SLOT=0
 SRC_URI=https://bitbucket.org/dismine/valentina/get/v0.5.0.zip -> valentina-0.5.0.zip https://bitbucket.org/dismine/valentina/commits/d78ca13c4891ccf3542b0704a7d66af0f9b02938/raw -> valentina-4798.patch https://bitbucket.org/dismine/valentina/commits/98e869c4146204ef31822087fa826cfa1cd7e0f4/raw -> valentina-4802.patch
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ad9eb53d4eb3467a3d584ffb8f69a766
+_md5_=fdeda7dda608828d0f123302314b321e
diff --git a/metadata/md5-cache/media-gfx/valentina-9999 b/metadata/md5-cache/media-gfx/valentina-9999
index 7001f0a16d77..8db1713fbb94 100644
--- a/metadata/md5-cache/media-gfx/valentina-9999
+++ b/metadata/md5-cache/media-gfx/valentina-9999
@@ -3,9 +3,9 @@ DEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt
 DESCRIPTION=Cloth patternmaking software
 EAPI=6
 HOMEPAGE=https://valentinaproject.bitbucket.io/
-IUSE=gnome linguas_cs_CZ linguas_de_DE linguas_el_GR linguas_en_CA linguas_en_US linguas_es_ES linguas_fi_FI linguas_fr_FR linguas_he_IL linguas_id_ID linguas_it_IT linguas_nl_NL linguas_pt_BR linguas_ro_RO linguas_ru_RU linguas_uk_UA linguas_zh_CN
+IUSE=gnome l10n_cs l10n_de l10n_el l10n_en l10n_en l10n_es l10n_fi l10n_fr l10n_he l10n_id l10n_it l10n_nl l10n_pt-BR l10n_ro l10n_ru l10n_uk l10n_zh-CN
 LICENSE=GPL-3
 RDEPEND=app-text/poppler dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	mercurial	0bdc9ce12272665fa3749c8408b4d389	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=be9a42102957751efd5370b6b358f83c
+_md5_=48e08b2c800e0cd0bc36d481dc48b2c2
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 9cad218a2da0..63a1bd4ad9ef 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/stimg-0.1.0 b/metadata/md5-cache/media-libs/stimg-0.1.0
index 5db509527d2d..3e1c47f3c013 100644
--- a/metadata/md5-cache/media-libs/stimg-0.1.0
+++ b/metadata/md5-cache/media-libs/stimg-0.1.0
@@ -3,11 +3,11 @@ DEPEND=media-libs/libpng media-libs/tiff virtual/jpeg
 DESCRIPTION=Simple and tiny image loading library
 EAPI=4
 HOMEPAGE=http://homepage3.nifty.com/slokar/fb/
-IUSE=linguas_ja static-libs
+IUSE=static-libs
 KEYWORDS=alpha amd64 ppc x86
 LICENSE=LGPL-2+ MIT-with-advertising
 RDEPEND=media-libs/libpng media-libs/tiff virtual/jpeg
 SLOT=0
 SRC_URI=http://homepage3.nifty.com/slokar/stimg/stimg-0.1.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=11b58ec126c35dea39f356b31385d9ea
+_md5_=729ca1f3d7af2d344a86913981fe53d0
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index a842d4cfaae8..1aa272af839a 100644
--- a/metadata/md5-cache/media-plugins/Manifest.gz
+++ b/metadata/md5-cache/media-plugins/Manifest.gz
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.0-r1 b/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.0-r1
index 8f540834cc35..8b7fe5ac7cd3 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.0-r1
+++ b/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.0-r1
@@ -3,7 +3,7 @@ DEPEND=>=media-video/vdr-1.3.45 pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre )
 DESCRIPTION=VDR Plugin: Searchtimer and replacement of the VDR program menu
 EAPI=5
 HOMEPAGE=http://winni.vdr-developer.org/epgsearch
-IUSE=pcre tre linguas_de
+IUSE=pcre tre l10n_de
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/vdr-1.3.45 pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
@@ -11,4 +11,4 @@ REQUIRED_USE=pcre? ( !tre ) tre? ( !pcre )
 SLOT=0
 SRC_URI=http://winni.vdr-developer.org/epgsearch/downloads/vdr-epgsearch-1.0.0.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vdr-plugin-2	786b4f5aa9f17e2d5cec5e628f462c01
-_md5_=03a4cb7a78853814d3f92434f9db28f3
+_md5_=dc62e068699f30e43e41fea6190514c9
diff --git a/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.1_p20141227 b/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.1_p20141227
index 108c6fe1198a..0e9cf8df05e5 100644
--- a/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.1_p20141227
+++ b/metadata/md5-cache/media-plugins/vdr-epgsearch-1.0.1_p20141227
@@ -3,7 +3,7 @@ DEPEND=media-video/vdr pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >=media-
 DESCRIPTION=VDR plugin: create timers from epg content based on saved search expressions
 EAPI=5
 HOMEPAGE=http://winni.vdr-developer.org/epgsearch
-IUSE=+conflictcheckonly +epgsearchonly linguas_de pcre +quicksearch tre
+IUSE=+conflictcheckonly +epgsearchonly l10n_de pcre +quicksearch tre
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-video/vdr pcre? ( dev-libs/libpcre ) tre? ( dev-libs/tre ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
@@ -11,4 +11,4 @@ REQUIRED_USE=pcre? ( !tre ) tre? ( !pcre )
 SLOT=0
 SRC_URI=http://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-a908daa4c5c6edd6c560ed96939358b4352e9b42.tar.gz -> vdr-epgsearch-1.0.1_p20141227.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	vdr-plugin-2	786b4f5aa9f17e2d5cec5e628f462c01
-_md5_=0faa8cb492fab1703866f667439da7e8
+_md5_=35caf6f139a356edbbda733f7f5ae8cc
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 600be700e025..aef883e88e6b 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/clementine-9999 b/metadata/md5-cache/media-sound/clementine-9999
index 04fed2bc6283..7f0ec2d2433e 100644
--- a/metadata/md5-cache/media-sound/clementine-9999
+++ b/metadata/md5-cache/media-sound/clementine-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++ dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5] media-libs/taglib[mp4(+)] sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt5] ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) || ( >=dev-cpp/gtest-1.8.0 dev-cpp/gmock ) dev-libs/boost:= dev-qt/linguist-tools:5 sys-devel/gettext virtual/pkgconfig box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) test? ( dev-qt/qttest:5 gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
+DEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++ dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5] media-libs/taglib[mp4(+)] sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt5] ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) || ( >=dev-cpp/gtest-1.8.0 dev-cpp/gmock ) dev-libs/boost:= dev-qt/linguist-tools:5 sys-devel/gettext virtual/pkgconfig box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) test? ( dev-qt/qttest:5 gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Modern music player and library organizer based on Amarok 1.4 and Qt
 EAPI=6
 HOMEPAGE=https://www.clementine-player.org https://github.com/clementine-player/Clementine
 IUSE=box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote test
 LICENSE=GPL-3
-RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++ dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5] media-libs/taglib[mp4(+)] sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt5] ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
+RDEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++ dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5] media-libs/taglib[mp4(+)] sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1[qt5] ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 ) media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 mms? ( media-plugins/gst-plugins-libmms:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
 REQUIRED_USE=udisks? ( dbus ) wiimote? ( dbus )
 SLOT=0
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	07318ed5f26525a9d302ca87d20b2865	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=768c7213773b92c67aa062bab65fc21d
+_md5_=1efe49374bc1c68ca6b2b36a43fc393c
diff --git a/metadata/md5-cache/media-sound/lmms-1.1.90 b/metadata/md5-cache/media-sound/lmms-1.1.90
index 6ba33a3d265f..89212e803d7d 100644
--- a/metadata/md5-cache/media-sound/lmms-1.1.90
+++ b/metadata/md5-cache/media-sound/lmms-1.1.90
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( || ( virtual/wine app-emulation/wine ) ) dev-qt/linguist-tools:5 >=dev-util/cmake-2.4.5 sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( virtual/wine ) dev-qt/linguist-tools:5 >=dev-util/cmake-2.4.5 sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Cross-platform music production software
 EAPI=6
 HOMEPAGE=https://lmms.io
 IUSE=alsa debug fluidsynth jack libgig ogg portaudio pulseaudio sdl soundio stk vst
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( || ( virtual/wine app-emulation/wine ) ) media-libs/ladspa-cmt media-plugins/calf media-plugins/caps-plugins media-plugins/swh-plugins media-plugins/tap-plugins
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( virtual/wine ) media-libs/ladspa-cmt media-plugins/calf media-plugins/caps-plugins media-plugins/swh-plugins media-plugins/tap-plugins
 SLOT=0
 SRC_URI=https://github.com/LMMS/lmms/archive/v1.1.90.tar.gz -> lmms-1.1.90.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6e65823dcb61e7272fbb6cba7f189ff8
+_md5_=09be4839287fbccd65c4909dcd4e79b5
diff --git a/metadata/md5-cache/media-sound/lmms-1.2.0_rc4 b/metadata/md5-cache/media-sound/lmms-1.2.0_rc4
index 81edb581ff7f..ea85724c958e 100644
--- a/metadata/md5-cache/media-sound/lmms-1.2.0_rc4
+++ b/metadata/md5-cache/media-sound/lmms-1.2.0_rc4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( || ( virtual/wine app-emulation/wine ) ) dev-qt/linguist-tools:5 >=dev-util/cmake-2.4.5 sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( virtual/wine ) dev-qt/linguist-tools:5 >=dev-util/cmake-2.4.5 sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Cross-platform music production software
 EAPI=6
 HOMEPAGE=https://lmms.io
 IUSE=alsa debug fluidsynth jack libgig ogg portaudio pulseaudio sdl soundio stk vst
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( || ( virtual/wine app-emulation/wine ) ) media-libs/ladspa-cmt media-plugins/calf media-plugins/caps-plugins media-plugins/swh-plugins media-plugins/tap-plugins
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( virtual/wine ) media-libs/ladspa-cmt media-plugins/calf media-plugins/caps-plugins media-plugins/swh-plugins media-plugins/tap-plugins
 SLOT=0
 SRC_URI=https://github.com/LMMS/lmms/archive/v1.2.0-rc4.tar.gz -> lmms-1.2.0_rc4.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=339aabe1cbf936d1d9793c6a4c1463ae
+_md5_=8d6ae56d559d3d23f8b2c569cd0a0e5a
diff --git a/metadata/md5-cache/media-sound/lmms-9999 b/metadata/md5-cache/media-sound/lmms-9999
index 4f7e31b8bda4..27bd03a866e8 100644
--- a/metadata/md5-cache/media-sound/lmms-9999
+++ b/metadata/md5-cache/media-sound/lmms-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( || ( virtual/wine app-emulation/wine ) ) dev-qt/linguist-tools:5 >=dev-util/cmake-2.4.5 sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( virtual/wine ) dev-qt/linguist-tools:5 >=dev-util/cmake-2.4.5 sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Cross-platform music production software
 EAPI=6
 HOMEPAGE=https://lmms.io
 IUSE=alsa debug fluidsynth jack libgig ogg portaudio pulseaudio sdl soundio stk vst
 LICENSE=GPL-2 LGPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( || ( virtual/wine app-emulation/wine ) ) media-libs/ladspa-cmt media-plugins/calf media-plugins/caps-plugins media-plugins/swh-plugins media-plugins/tap-plugins
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 >=media-libs/libsamplerate-0.1.8 >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib >=x11-libs/fltk-1.3.0_rc3:1 alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) libgig? ( media-libs/libgig ) ogg? ( media-libs/libogg media-libs/libvorbis ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl >=media-libs/sdl-sound-1.0.1 ) soundio? ( media-libs/libsoundio ) stk? ( media-libs/stk ) vst? ( virtual/wine ) media-libs/ladspa-cmt media-plugins/calf media-plugins/caps-plugins media-plugins/swh-plugins media-plugins/tap-plugins
 SLOT=0
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=339aabe1cbf936d1d9793c6a4c1463ae
+_md5_=8d6ae56d559d3d23f8b2c569cd0a0e5a
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index df80dabef94a..d87cad3d05d4 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/dvgrab-3.5 b/metadata/md5-cache/media-video/dvgrab-3.5
deleted file mode 100644
index 326bcf8447be..000000000000
--- a/metadata/md5-cache/media-video/dvgrab-3.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=sys-libs/libraw1394-1.1 >=media-libs/libdv-0.103 >=media-libs/libiec61883-1 >=sys-libs/libavc1394-0.5.1 jpeg? ( virtual/jpeg ) quicktime? ( media-libs/libquicktime ) virtual/pkgconfig
-DESCRIPTION=Digital Video (DV) grabber for GNU/Linux
-EAPI=0
-HOMEPAGE=http://www.kinodv.org/
-IUSE=jpeg quicktime
-KEYWORDS=amd64 ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/libraw1394-1.1 >=media-libs/libdv-0.103 >=media-libs/libiec61883-1 >=sys-libs/libavc1394-0.5.1 jpeg? ( virtual/jpeg ) quicktime? ( media-libs/libquicktime )
-SLOT=0
-SRC_URI=mirror://sourceforge/kino/dvgrab-3.5.tar.gz
-_md5_=e20704fa16f5a9a08479e564abfbc324
diff --git a/metadata/md5-cache/media-video/dvgrab-3.5-r1 b/metadata/md5-cache/media-video/dvgrab-3.5-r1
index dfb77fd7ea57..eb12a38dc404 100644
--- a/metadata/md5-cache/media-video/dvgrab-3.5-r1
+++ b/metadata/md5-cache/media-video/dvgrab-3.5-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure
 DEPEND=>=sys-libs/libraw1394-1.1 >=media-libs/libdv-0.103 >=media-libs/libiec61883-1 >=sys-libs/libavc1394-0.5.1 jpeg? ( virtual/jpeg:0 ) quicktime? ( media-libs/libquicktime ) virtual/pkgconfig
 DESCRIPTION=Digital Video (DV) grabber for GNU/Linux
 EAPI=6
-HOMEPAGE=http://www.kinodv.org/
+HOMEPAGE=https://github.com/ddennedy/dvgrab
 IUSE=jpeg quicktime
 KEYWORDS=amd64 ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/libraw1394-1.1 >=media-libs/libdv-0.103 >=media-libs/libiec61883-1 >=sys-libs/libavc1394-0.5.1 jpeg? ( virtual/jpeg:0 ) quicktime? ( media-libs/libquicktime )
 SLOT=0
 SRC_URI=mirror://sourceforge/kino/dvgrab-3.5.tar.gz
-_md5_=bbb216ee8c0fc90a35c69b42e93c2d04
+_md5_=ba40f79157cafa9dd42fc71d42a6b0c5
diff --git a/metadata/md5-cache/media-video/kmplayer-0.12.0b b/metadata/md5-cache/media-video/kmplayer-0.12.0b
deleted file mode 100644
index fe5d079d93ee..000000000000
--- a/metadata/md5-cache/media-video/kmplayer-0.12.0b
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kmediaplayer-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libxcb cairo? ( x11-libs/cairo[xcb] ) npp? ( dev-libs/dbus-glib dev-libs/glib:2 www-plugins/adobe-flash:* >=x11-libs/gtk+-2.10.14:2 ) sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Video player plugin for Konqueror and basic MPlayer frontend
-EAPI=6
-HOMEPAGE=https://kmplayer.kde.org
-IUSE=cairo npp debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 FDL-1.2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kmediaplayer-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libxcb cairo? ( x11-libs/cairo[xcb] ) npp? ( dev-libs/dbus-glib dev-libs/glib:2 www-plugins/adobe-flash:* >=x11-libs/gtk+-2.10.14:2 ) media-video/mplayer !media-video/kmplayer:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/kmplayer//kmplayer-0.12.0b.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1184600c69045fa35da886537b332fc9
diff --git a/metadata/md5-cache/media-video/tsmuxer-1.10.6-r1 b/metadata/md5-cache/media-video/tsmuxer-1.10.6-r1
index e5f3b58452f3..cc2023d4fb32 100644
--- a/metadata/md5-cache/media-video/tsmuxer-1.10.6-r1
+++ b/metadata/md5-cache/media-video/tsmuxer-1.10.6-r1
@@ -3,11 +3,11 @@ DEPEND=|| ( >=app-arch/upx-ucl-3.01 >=app-arch/upx-bin-3.01 )
 DESCRIPTION=Utility to create and demux TS and M2TS files
 EAPI=5
 HOMEPAGE=http://www.smlabs.net/en/products/tsmuxer/
-IUSE=qt4 linguas_ru
+IUSE=qt4 l10n_ru
 KEYWORDS=~amd64 ~x86
 LICENSE=SmartLabs
 RDEPEND=x86? ( media-libs/freetype:2 qt4? ( dev-libs/glib:2 dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/fontconfig x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXrender ) ) amd64? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)] qt4? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] >=dev-qt/qtcore-4.8.5-r1:4[abi_x86_32(-)] >=dev-qt/qtgui-4.8.5-r2:4[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] ) )
 SLOT=0
 SRC_URI=http://www.smlabs.net/tsMuxer/tsMuxeR_shared_1.10.6.tar.gz http://gentoo.sbriesen.de/distfiles/tsmuxer-icon.png
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c1a699b7992aca441462b4660890319a
+_md5_=fc5c1b64f8550801e24ab4fdd126e72b
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 247a3415a299..de84aaada4f4 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/sslscan-1.11.11 b/metadata/md5-cache/net-analyzer/sslscan-1.11.11
new file mode 100644
index 000000000000..6c2841501bd5
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/sslscan-1.11.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=libressl? ( dev-libs/libressl )
+DESCRIPTION=Fast SSL configuration scanner
+EAPI=6
+HOMEPAGE=https://github.com/rbsec/sslscan
+IUSE=libressl +static
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=libressl? ( dev-libs/libressl )
+SLOT=0
+SRC_URI=https://github.com/rbsec/sslscan/archive/1.11.11-rbsec.tar.gz -> sslscan-1.11.11-rbsec.tar.gz static? ( https://github.com/PeterMosmans/openssl/archive/c9ba19c8b7fd131137373dbd1fccd6a8bb0628be.tar.gz -> sslscan-1.11.11-rbsec-openssl.tar.gz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=75ae61aef48f71217bf5780bffb1c5bb
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 9d729cca72a7..080c615be5db 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.76 b/metadata/md5-cache/net-dns/dnsmasq-2.76
index 937d3902757e..61edd183b166 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.76
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.76
@@ -3,7 +3,7 @@ DEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) lua? ( dev-lang/lua:* ) c
 DESCRIPTION=Small forwarding DNS server
 EAPI=6
 HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html
-IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn +inotify ipv6 lua nls script selinux static tftp linguas_de linguas_es linguas_fi linguas_fr linguas_id linguas_it linguas_no linguas_pl linguas_pt_BR linguas_ro
+IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn +inotify ipv6 lua nls script selinux static tftp
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext net-dns/libidn ) dnssec? ( !static? ( dev-libs/nettle[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq )
@@ -11,4 +11,4 @@ REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script )
 SLOT=0
 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.76.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=43594ee5c6aa8c0fb3cb8d9667de08f0
+_md5_=ffce10760e28c4adb8c9f5eeacc6c98c
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.76-r1 b/metadata/md5-cache/net-dns/dnsmasq-2.76-r1
index 1c90f7b0eb65..6132e0976981 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.76-r1
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.76-r1
@@ -3,7 +3,7 @@ DEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) lua? ( dev-lang/lua:* ) c
 DESCRIPTION=Small forwarding DNS server
 EAPI=6
 HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html
-IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn +inotify ipv6 lua nls script selinux static tftp linguas_de linguas_es linguas_fi linguas_fr linguas_id linguas_it linguas_no linguas_pl linguas_pt_BR linguas_ro
+IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn +inotify ipv6 lua nls script selinux static tftp
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext net-dns/libidn ) dnssec? ( !static? ( dev-libs/nettle[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq )
@@ -11,4 +11,4 @@ REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script )
 SLOT=0
 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.76.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=27eb04bdaff7dbed90cb90f1f952b8a0
+_md5_=466686bbad0ac6cd31577a5ae670ee27
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.77 b/metadata/md5-cache/net-dns/dnsmasq-2.77
index 0c1d51009cca..6a3399d64b74 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.77
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.77
@@ -3,7 +3,7 @@ DEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) libidn2? ( >=net-dns/libi
 DESCRIPTION=Small forwarding DNS server
 EAPI=6
 HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html
-IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec +id idn libidn2 +inotify ipv6 lua nls script selinux static tftp linguas_de linguas_es linguas_fi linguas_fr linguas_id linguas_it linguas_no linguas_pl linguas_pt_BR linguas_ro
+IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec +id idn libidn2 +inotify ipv6 lua nls script selinux static tftp
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) libidn2? ( >=net-dns/libidn2-2.0 ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext ) dnssec? ( !static? ( dev-libs/nettle[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq )
@@ -11,4 +11,4 @@ REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) libidn2? ( !idn )
 SLOT=0
 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.77.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=478b081c6c01c851fcc404f44b7bd4aa
+_md5_=5c7b0c8c0f2c29489e91f9a5a81ee2d5
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.77-r1 b/metadata/md5-cache/net-dns/dnsmasq-2.77-r1
index fe9d4935562b..c95b75290a3c 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.77-r1
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.77-r1
@@ -3,7 +3,7 @@ DEPEND=dbus? ( sys-apps/dbus ) idn? ( !libidn2? ( net-dns/libidn ) libidn2? ( >=
 DESCRIPTION=Small forwarding DNS server
 EAPI=6
 HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html
-IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec +id idn libidn2 +inotify ipv6 lua nls script selinux static tftp linguas_de linguas_es linguas_fi linguas_fr linguas_id linguas_it linguas_no linguas_pl linguas_pt_BR linguas_ro
+IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec +id idn libidn2 +inotify ipv6 lua nls script selinux static tftp
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dbus? ( sys-apps/dbus ) idn? ( !libidn2? ( net-dns/libidn ) libidn2? ( >=net-dns/libidn2-2.0 ) ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext ) dnssec? ( !static? ( dev-libs/nettle[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq )
@@ -11,4 +11,4 @@ REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) libidn2? ( idn )
 SLOT=0
 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.77.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=a00607b1bb26ec55cb6510543c874194
+_md5_=bf6092332505aa3d46ad0ce4e801d3b6
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.78 b/metadata/md5-cache/net-dns/dnsmasq-2.78
index 3c6b6b330a08..3d378602890c 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.78
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.78
@@ -3,7 +3,7 @@ DEPEND=dbus? ( sys-apps/dbus ) idn? ( !libidn2? ( net-dns/libidn ) libidn2? ( >=
 DESCRIPTION=Small forwarding DNS server
 EAPI=6
 HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html
-IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec +id idn libidn2 +inotify ipv6 lua nls script selinux static tftp linguas_de linguas_es linguas_fi linguas_fr linguas_id linguas_it linguas_no linguas_pl linguas_pt_BR linguas_ro
+IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec +id idn libidn2 +inotify ipv6 lua nls script selinux static tftp
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=dbus? ( sys-apps/dbus ) idn? ( !libidn2? ( net-dns/libidn ) libidn2? ( >=net-dns/libidn2-2.0 ) ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack ) nls? ( sys-devel/gettext ) dnssec? ( !static? ( dev-libs/nettle[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq )
@@ -11,4 +11,4 @@ REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) libidn2? ( idn )
 SLOT=0
 SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.78.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=e777bf000dc9db4a43ebb984912f6ad6
+_md5_=cba948efe4246b5ae316fb3f1b3ee7f7
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index a294d7cb2895..44da0f487018 100644
--- a/metadata/md5-cache/net-ftp/Manifest.gz
+++ b/metadata/md5-cache/net-ftp/Manifest.gz
diff --git a/metadata/md5-cache/net-ftp/oneclickftp-0.5.1 b/metadata/md5-cache/net-ftp/oneclickftp-0.5.1
deleted file mode 100644
index ecf94aa54e02..000000000000
--- a/metadata/md5-cache/net-ftp/oneclickftp-0.5.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=app-crypt/qca:2[qt4(+)] dev-qt/qtcore:4 dev-qt/qtgui:4
-DESCRIPTION=The somehow different FTP client
-EAPI=6
-HOMEPAGE=http://oneclickftp.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-crypt/qca:2[qt4(+)] dev-qt/qtcore:4 dev-qt/qtgui:4
-SLOT=0
-SRC_URI=mirror://sourceforge/oneclickftp/oneclickftp-0.5.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5893174c94938d7438241f88aae71af6
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 87baf14060d0..0ae4da98d467 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/mcabber-1.0.5 b/metadata/md5-cache/net-im/mcabber-1.0.5
index 6b0b02272523..b2e54fb4272a 100644
--- a/metadata/md5-cache/net-im/mcabber-1.0.5
+++ b/metadata/md5-cache/net-im/mcabber-1.0.5
@@ -3,11 +3,11 @@ DEPEND=crypt? ( >=app-crypt/gpgme-1.0.0 ) otr? ( >=net-libs/libotr-3.1.0 ) aspel
 DESCRIPTION=A small Jabber console client with various features, like MUC, SSL, PGP
 EAPI=5
 HOMEPAGE=http://mcabber.com/
-IUSE=aspell crypt idn modules otr spell ssl vim-syntax linguas_cs linguas_de linguas_fr linguas_it linguas_nl linguas_pl linguas_ru linguas_uk
+IUSE=aspell crypt idn modules otr spell ssl vim-syntax l10n_cs l10n_de l10n_fr l10n_it l10n_nl l10n_pl l10n_ru l10n_uk
 KEYWORDS=~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=crypt? ( >=app-crypt/gpgme-1.0.0 ) otr? ( >=net-libs/libotr-3.1.0 ) aspell? ( app-text/aspell ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) idn? ( net-dns/libidn ) spell? ( app-text/enchant ) dev-libs/glib:2 sys-libs/ncurses:0= >=net-libs/loudmouth-1.4.3-r1[ssl?]
 SLOT=0
 SRC_URI=http://mcabber.com/files/mcabber-1.0.5.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=65baaa55190849c43a3dd3a62ded2c2f
+_md5_=69b84ca39ed9f48515cb6b17a3e0dc9e
diff --git a/metadata/md5-cache/net-im/mcabber-1.1.0 b/metadata/md5-cache/net-im/mcabber-1.1.0
index b59f56e85cec..b85f7eed2c5b 100644
--- a/metadata/md5-cache/net-im/mcabber-1.1.0
+++ b/metadata/md5-cache/net-im/mcabber-1.1.0
@@ -3,11 +3,11 @@ DEPEND=crypt? ( >=app-crypt/gpgme-1.0.0 ) otr? ( >=net-libs/libotr-3.1.0 ) aspel
 DESCRIPTION=A small Jabber console client with various features, like MUC, SSL, PGP
 EAPI=5
 HOMEPAGE=http://mcabber.com/
-IUSE=aspell crypt idn modules otr spell ssl vim-syntax linguas_cs linguas_de linguas_fr linguas_it linguas_nl linguas_pl linguas_ru linguas_uk
+IUSE=aspell crypt idn modules otr spell ssl vim-syntax l10n_cs l10n_de l10n_fr l10n_it l10n_nl l10n_pl l10n_ru l10n_uk
 KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2
 RDEPEND=crypt? ( >=app-crypt/gpgme-1.0.0 ) otr? ( >=net-libs/libotr-3.1.0 ) aspell? ( app-text/aspell ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) idn? ( net-dns/libidn ) spell? ( app-text/enchant ) dev-libs/glib:2 sys-libs/ncurses:0= >=net-libs/loudmouth-1.4.3-r1[ssl?]
 SLOT=0
 SRC_URI=http://mcabber.com/files/mcabber-1.1.0.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0ef07595a02b42e5280136de2fd8b40d
+_md5_=b1e1255870eae17d3ff56e0a393a337d
diff --git a/metadata/md5-cache/net-im/mcabber-9999 b/metadata/md5-cache/net-im/mcabber-9999
index f4d115cbbdbd..fd19ef025823 100644
--- a/metadata/md5-cache/net-im/mcabber-9999
+++ b/metadata/md5-cache/net-im/mcabber-9999
@@ -3,9 +3,9 @@ DEPEND=crypt? ( >=app-crypt/gpgme-1.0.0 ) otr? ( >=net-libs/libotr-3.1.0 ) aspel
 DESCRIPTION=A small Jabber console client with various features, like MUC, SSL, PGP
 EAPI=5
 HOMEPAGE=http://mcabber.com/
-IUSE=aspell crypt idn modules otr spell ssl vim-syntax linguas_cs linguas_de linguas_fr linguas_it linguas_nl linguas_pl linguas_ru linguas_uk
+IUSE=aspell crypt idn modules otr spell ssl vim-syntax l10n_cs l10n_de l10n_fr l10n_it l10n_nl l10n_pl l10n_ru l10n_uk
 LICENSE=GPL-2
 RDEPEND=crypt? ( >=app-crypt/gpgme-1.0.0 ) otr? ( >=net-libs/libotr-3.1.0 ) aspell? ( app-text/aspell ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) idn? ( net-dns/libidn ) spell? ( app-text/enchant ) dev-libs/glib:2 sys-libs/ncurses:0= >=net-libs/loudmouth-1.4.3-r1[ssl?]
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mercurial	0bdc9ce12272665fa3749c8408b4d389	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d1639a0e33f663927041034dcae814b9
+_md5_=5f0f29c87510eb84fafc879f893e99b8
diff --git a/metadata/md5-cache/net-im/pork-0.99.8.1-r1 b/metadata/md5-cache/net-im/pork-0.99.8.1-r1
deleted file mode 100644
index 1022b5103537..000000000000
--- a/metadata/md5-cache/net-im/pork-0.99.8.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=perl? ( dev-lang/perl ) sys-libs/ncurses:0= >=app-portage/elt-patches-20170422 !<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=Console based AIM client that looks like ircII
-EAPI=6
-HOMEPAGE=http://dev.ojnk.net/
-IUSE=perl
-KEYWORDS=alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=perl? ( dev-lang/perl ) sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=mirror://sourceforge/ojnk/pork-0.99.8.1.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3c8554421039cb00eb678aa8e251f5d0
diff --git a/metadata/md5-cache/net-im/pyaim-t-0.8.0.1-r1 b/metadata/md5-cache/net-im/pyaim-t-0.8.0.1-r1
deleted file mode 100644
index 69458a00e6da..000000000000
--- a/metadata/md5-cache/net-im/pyaim-t-0.8.0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] net-im/jabber-base
-DESCRIPTION=Python based jabber transport for AIM
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=webinterface python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] net-im/jabber-base dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/twisted-words[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/twisted-web[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] webinterface? ( >=dev-python/nevow-0.4.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://debian/pool/main/p/pyaimt/pyaimt_0.8.0.1.orig.tar.gz -> pyaim-t-0.8.0.1.tar.gz https://launchpad.net/ubuntu/+archive/primary/+files/pyaimt_0.8.0.1.orig.tar.gz -> pyaim-t-0.8.0.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1fa20e9fa8c81b62fbdb2290561e0e0e
diff --git a/metadata/md5-cache/net-im/reaim-0.8-r2 b/metadata/md5-cache/net-im/reaim-0.8-r2
deleted file mode 100644
index 0a305b8619ec..000000000000
--- a/metadata/md5-cache/net-im/reaim-0.8-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=AIM transport proxy over NAT firewalls
-EAPI=6
-HOMEPAGE=http://reaim.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=net-firewall/iptables
-SLOT=0
-SRC_URI=mirror://sourceforge/reaim/reaim-0.8.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f1711a8ac12b08056d44a37ad348f50d
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 9e2615622515..49b57fef5925 100644
--- a/metadata/md5-cache/net-irc/Manifest.gz
+++ b/metadata/md5-cache/net-irc/Manifest.gz
diff --git a/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325 b/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325
index b1338a9890b3..a2a3e4ccf342 100644
--- a/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325
+++ b/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325
@@ -3,7 +3,7 @@ DEPEND=ruby_targets_ruby22? ( nls? ( >=dev-ruby/ruby-gettext-2[ruby_targets_ruby
 DESCRIPTION=A ruby IRC bot
 EAPI=5
 HOMEPAGE=http://ruby-rbot.org/
-IUSE=spell aspell timezone translator shorturl nls figlet fortune cal host toilet linguas_zh_CN linguas_zh_TW linguas_ru linguas_nl linguas_de linguas_fi linguas_fr linguas_it linguas_ja test elibc_FreeBSD ruby_targets_ruby22
+IUSE=spell aspell timezone translator shorturl nls figlet fortune cal host toilet test elibc_FreeBSD ruby_targets_ruby22
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=|| ( feh GPL-2 )
 RDEPEND=spell? ( aspell? ( app-text/aspell ) !aspell? ( app-text/hunspell ) ) figlet? ( app-misc/figlet ) toilet? ( app-misc/toilet ) fortune? ( games-misc/fortune-mod ) cal? ( || ( sys-apps/util-linux sys-freebsd/freebsd-ubin ) ) host? ( net-dns/bind-tools ) ruby_targets_ruby22? ( dev-ruby/tokyocabinet[ruby_targets_ruby22] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby22] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby22] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby22] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby22] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 )
 SLOT=0
 SRC_URI=https://github.com/ruby-rbot/rbot/archive/e358601cc521d8aced941eb928fae2d8c53cf0c2.tar.gz -> rbot-0.9.15_p20160325.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3cbd3fa3be17a3e8cd7ae94873cefdbf
+_md5_=fbfdeddc9620a67f9c77e089f58157ce
diff --git a/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r1 b/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r1
index f68acae4e44e..2300cdcceda4 100644
--- a/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r1
+++ b/metadata/md5-cache/net-irc/rbot-0.9.15_p20160325-r1
@@ -3,7 +3,7 @@ DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/sqlite3[ruby_targets_ruby22] ) nl
 DESCRIPTION=A ruby IRC bot
 EAPI=5
 HOMEPAGE=http://ruby-rbot.org/
-IUSE=spell aspell timezone translator shorturl nls figlet fortune cal host sqlite toilet linguas_zh_CN linguas_zh_TW linguas_ru linguas_nl linguas_de linguas_fi linguas_fr linguas_it linguas_ja test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
+IUSE=spell aspell timezone translator shorturl nls figlet fortune cal host sqlite toilet test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23
 KEYWORDS=~amd64
 LICENSE=|| ( feh GPL-2 )
 RDEPEND=spell? ( aspell? ( app-text/aspell ) !aspell? ( app-text/hunspell ) ) figlet? ( app-misc/figlet ) sqlite? ( dev-ruby/sqlite3 ) toilet? ( app-misc/toilet ) fortune? ( games-misc/fortune-mod ) cal? ( || ( sys-apps/util-linux sys-freebsd/freebsd-ubin ) ) host? ( net-dns/bind-tools ) ruby_targets_ruby22? ( dev-ruby/tokyocabinet[ruby_targets_ruby22] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby22] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby22] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby22] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby22] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( dev-ruby/tokyocabinet[ruby_targets_ruby23] timezone? ( dev-ruby/tzinfo:*[ruby_targets_ruby23] ) translator? ( dev-ruby/mechanize[ruby_targets_ruby23] ) shorturl? ( dev-ruby/shorturl[ruby_targets_ruby23] ) nls? ( dev-ruby/ruby-gettext[ruby_targets_ruby23] >=dev-ruby/locale-2.0.5-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=https://github.com/ruby-rbot/rbot/archive/e358601cc521d8aced941eb928fae2d8c53cf0c2.tar.gz -> rbot-0.9.15_p20160325.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b7c16b58f26e312900e272f80903c229
+_md5_=2721c65aeed852698d96a21a7bc846b6
diff --git a/metadata/md5-cache/net-irc/weechat-1.9.1 b/metadata/md5-cache/net-irc/weechat-1.9.1
index 5fb5dcd3e9bd..2005c351bb78 100644
--- a/metadata/md5-cache/net-irc/weechat-1.9.1
+++ b/metadata/md5-cache/net-irc/weechat-1.9.1
@@ -3,7 +3,7 @@ DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zli
 DESCRIPTION=Portable and multi-interface IRC client
 EAPI=6
 HOMEPAGE=https://weechat.org/
-IUSE=doc nls +ssl test linguas_cs linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_tr guile lua +perl +python ruby tcl +alias +buflist +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer +irc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+IUSE=doc nls +ssl test guile lua +perl +python ruby tcl +alias +buflist +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer +irc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://weechat.org/files/src/weechat-1.9.1.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c2314399300421da6792ef3193a55e3f
+_md5_=b7d4d609fe941a9ce5136348bceec021
diff --git a/metadata/md5-cache/net-irc/weechat-2.0 b/metadata/md5-cache/net-irc/weechat-2.0
index 83aa602e6d29..937ff9c78cf9 100644
--- a/metadata/md5-cache/net-irc/weechat-2.0
+++ b/metadata/md5-cache/net-irc/weechat-2.0
@@ -3,7 +3,7 @@ DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zli
 DESCRIPTION=Portable and multi-interface IRC client
 EAPI=6
 HOMEPAGE=https://weechat.org/
-IUSE=doc nls +ssl test linguas_cs linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_tr guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer +irc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+IUSE=doc nls +ssl test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer +irc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=~amd64 ~x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:* ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://weechat.org/files/src/weechat-2.0.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c27971a312672a8fd36c083926c17b38
+_md5_=8045d1b006185a74aaf2b2e4cb25afcb
diff --git a/metadata/md5-cache/net-irc/weechat-2.0.1 b/metadata/md5-cache/net-irc/weechat-2.0.1
index 92a035165385..c75cb47bccad 100644
--- a/metadata/md5-cache/net-irc/weechat-2.0.1
+++ b/metadata/md5-cache/net-irc/weechat-2.0.1
@@ -3,7 +3,7 @@ DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zli
 DESCRIPTION=Portable and multi-interface IRC client
 EAPI=6
 HOMEPAGE=https://weechat.org/
-IUSE=doc nls +ssl test linguas_cs linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_tr guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer +irc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+IUSE=doc nls +ssl test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer +irc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=~amd64 ~x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:* ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://weechat.org/files/src/weechat-2.0.1.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c27971a312672a8fd36c083926c17b38
+_md5_=8045d1b006185a74aaf2b2e4cb25afcb
diff --git a/metadata/md5-cache/net-irc/weechat-9999 b/metadata/md5-cache/net-irc/weechat-9999
index 54d5e436cd89..d94ede86bc12 100644
--- a/metadata/md5-cache/net-irc/weechat-9999
+++ b/metadata/md5-cache/net-irc/weechat-9999
@@ -3,11 +3,11 @@ DEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zli
 DESCRIPTION=Portable and multi-interface IRC client
 EAPI=6
 HOMEPAGE=https://weechat.org/
-IUSE=doc nls +ssl test linguas_cs linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_pl linguas_pt linguas_pt_BR linguas_ru linguas_tr guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer +irc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+IUSE=doc nls +ssl test guile lua +perl php +python ruby tcl +alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spell +trigger +xfer +irc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 LICENSE=GPL-3
 RDEPEND=dev-libs/libgcrypt:0= net-misc/curl[ssl] sys-libs/ncurses:0= sys-libs/zlib charset? ( virtual/libiconv ) guile? ( >=dev-scheme/guile-2.0 ) lua? ( dev-lang/lua:0[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) php? ( >=dev-lang/php-7.0:* ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15:0= )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c27971a312672a8fd36c083926c17b38
+_md5_=8045d1b006185a74aaf2b2e4cb25afcb
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index b5c43954e11e..ac7441966a12 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/ignition-msgs-1.0.0 b/metadata/md5-cache/net-libs/ignition-msgs-1.0.0
new file mode 100644
index 000000000000..548cd790d5d3
--- /dev/null
+++ b/metadata/md5-cache/net-libs/ignition-msgs-1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/protobuf:=[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(-)?] sci-libs/ignition-math:4=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/ignition-cmake[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/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Protobuf messages and functions for robot applications
+EAPI=6
+HOMEPAGE=http://ignitionrobotics.org/libraries/messages https://bitbucket.org/ignitionrobotics/ign-msgs
+IUSE=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=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/protobuf:=[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(-)?] sci-libs/ignition-math:4=[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=1
+SRC_URI=https://osrf-distributions.s3.amazonaws.com/ign-msgs/releases/ignition-msgs-1.0.0.tar.bz2
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2d9f8595a8dc9a1046b0cf74e837821f
diff --git a/metadata/md5-cache/net-libs/ignition-transport-3.0.1 b/metadata/md5-cache/net-libs/ignition-transport-3.0.1
deleted file mode 100644
index 494e0f3e14af..000000000000
--- a/metadata/md5-cache/net-libs/ignition-transport-3.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=net-libs/ignition-msgs:= dev-libs/protobuf:= >=net-libs/zeromq-3.2.0:= sys-apps/util-linux net-libs/cppzmq virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Combines ZeroMQ with Protobufs to create a fast and efficient message passing system
-EAPI=5
-HOMEPAGE=http://ignitionrobotics.org/libraries/transport
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=net-libs/ignition-msgs:= dev-libs/protobuf:= >=net-libs/zeromq-3.2.0:= sys-apps/util-linux net-libs/cppzmq
-SLOT=3/3
-SRC_URI=http://gazebosim.org/distributions/ign-transport/releases/ignition-transport3-3.0.1.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=751a40744e0510a6547183b3e17e2c78
diff --git a/metadata/md5-cache/net-libs/ignition-transport-3.1.0 b/metadata/md5-cache/net-libs/ignition-transport-3.1.0-r1
index 8e680e502557..ee8b721fbbc4 100644
--- a/metadata/md5-cache/net-libs/ignition-transport-3.1.0
+++ b/metadata/md5-cache/net-libs/ignition-transport-3.1.0-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=net-libs/ignition-msgs:= dev-libs/protobuf:= >=net-libs/zeromq-3.2.0:= sys-apps/util-linux net-libs/cppzmq virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=net-libs/ignition-msgs:0= dev-libs/protobuf:= >=net-libs/zeromq-3.2.0:= sys-apps/util-linux net-libs/cppzmq virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Combines ZeroMQ with Protobufs to create a fast and efficient message passing system
 EAPI=5
 HOMEPAGE=http://ignitionrobotics.org/libraries/transport
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=net-libs/ignition-msgs:= dev-libs/protobuf:= >=net-libs/zeromq-3.2.0:= sys-apps/util-linux net-libs/cppzmq
+RDEPEND=net-libs/ignition-msgs:0= dev-libs/protobuf:= >=net-libs/zeromq-3.2.0:= sys-apps/util-linux net-libs/cppzmq
 SLOT=3/3
 SRC_URI=http://gazebosim.org/distributions/ign-transport/releases/ignition-transport3-3.1.0.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=751a40744e0510a6547183b3e17e2c78
+_md5_=57dca8254a47401b6b410e57f5713320
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 45a6530f2b75..61a08c717368 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/asterisk-core-sounds-1.4.21-r1 b/metadata/md5-cache/net-misc/asterisk-core-sounds-1.4.21-r1
index 4b34b2375764..d1773dae220b 100644
--- a/metadata/md5-cache/net-misc/asterisk-core-sounds-1.4.21-r1
+++ b/metadata/md5-cache/net-misc/asterisk-core-sounds-1.4.21-r1
@@ -3,9 +3,9 @@ DEPEND=>=net-misc/asterisk-1.4
 DESCRIPTION=Core sounds for asterisk
 EAPI=4
 HOMEPAGE=http://www.asterisk.org/
-IUSE=alaw g722 g729 siren7 siren14 sln16 ulaw wav linguas_fr linguas_es linguas_ru
+IUSE=alaw g722 g729 siren7 siren14 sln16 ulaw wav l10n_fr l10n_es l10n_ru
 KEYWORDS=amd64 x86
 LICENSE=CC-BY-SA-3.0
 SLOT=0
-SRC_URI=alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.4.21.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-1.4.21.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-1.4.21.tar.gz ) http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.4.21.tar.gz siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-siren7-1.4.21.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-siren14-1.4.21.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-sln16-1.4.21.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-1.4.21.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-1.4.21.tar.gz ) linguas_fr? ( alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-alaw-1.4.21.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-g722-1.4.21.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-g729-1.4.21.tar.gz ) http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-gsm-1.4.21.tar.gz siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-siren7-1.4.21.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-siren14-1.4.21.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-sln16-1.4.21.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-ulaw-1.4.21.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-wav-1.4.21.tar.gz ) ) linguas_es? ( alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-alaw-1.4.21.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-g722-1.4.21.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-g729-1.4.21.tar.gz ) http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-gsm-1.4.21.tar.gz siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-siren7-1.4.21.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-siren14-1.4.21.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-sln16-1.4.21.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-ulaw-1.4.21.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-wav-1.4.21.tar.gz ) ) linguas_ru? ( alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-alaw-1.4.21.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-g722-1.4.21.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-g729-1.4.21.tar.gz ) http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-gsm-1.4.21.tar.gz siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-siren7-1.4.21.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-siren14-1.4.21.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-sln16-1.4.21.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-ulaw-1.4.21.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-wav-1.4.21.tar.gz ) )
-_md5_=d089b5f870b3bbae190feb05b2c9a454
+SRC_URI=alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.4.21.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-1.4.21.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-1.4.21.tar.gz ) http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.4.21.tar.gz siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-siren7-1.4.21.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-siren14-1.4.21.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-sln16-1.4.21.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-1.4.21.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-1.4.21.tar.gz ) l10n_fr? ( alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-alaw-1.4.21.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-g722-1.4.21.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-g729-1.4.21.tar.gz ) http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-gsm-1.4.21.tar.gz siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-siren7-1.4.21.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-siren14-1.4.21.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-sln16-1.4.21.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-ulaw-1.4.21.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-wav-1.4.21.tar.gz ) ) l10n_es? ( alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-alaw-1.4.21.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-g722-1.4.21.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-g729-1.4.21.tar.gz ) http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-gsm-1.4.21.tar.gz siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-siren7-1.4.21.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-siren14-1.4.21.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-sln16-1.4.21.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-ulaw-1.4.21.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-wav-1.4.21.tar.gz ) ) l10n_ru? ( alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-alaw-1.4.21.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-g722-1.4.21.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-g729-1.4.21.tar.gz ) http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-gsm-1.4.21.tar.gz siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-siren7-1.4.21.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-siren14-1.4.21.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-sln16-1.4.21.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-ulaw-1.4.21.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-wav-1.4.21.tar.gz ) )
+_md5_=0daa9b6bb057683739ab2dc35675d67a
diff --git a/metadata/md5-cache/net-misc/asterisk-core-sounds-1.4.22 b/metadata/md5-cache/net-misc/asterisk-core-sounds-1.4.22
index ce906c81bd7c..c3f6c7610144 100644
--- a/metadata/md5-cache/net-misc/asterisk-core-sounds-1.4.22
+++ b/metadata/md5-cache/net-misc/asterisk-core-sounds-1.4.22
@@ -3,9 +3,9 @@ DEPEND=>=net-misc/asterisk-1.4
 DESCRIPTION=Core sounds for asterisk
 EAPI=4
 HOMEPAGE=http://www.asterisk.org/
-IUSE=alaw g722 g729 siren7 siren14 sln16 ulaw wav linguas_fr linguas_es linguas_ru
+IUSE=alaw g722 g729 siren7 siren14 sln16 ulaw wav l10n_fr l10n_es l10n_ru
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=CC-BY-SA-3.0
 SLOT=0
-SRC_URI=alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.4.22.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-1.4.22.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-1.4.22.tar.gz ) http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.4.22.tar.gz siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-siren7-1.4.22.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-siren14-1.4.22.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-sln16-1.4.22.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-1.4.22.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-1.4.22.tar.gz ) linguas_fr? ( alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-alaw-1.4.22.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-g722-1.4.22.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-g729-1.4.22.tar.gz ) http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-gsm-1.4.22.tar.gz siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-siren7-1.4.22.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-siren14-1.4.22.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-sln16-1.4.22.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-ulaw-1.4.22.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-wav-1.4.22.tar.gz ) ) linguas_es? ( alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-alaw-1.4.22.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-g722-1.4.22.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-g729-1.4.22.tar.gz ) http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-gsm-1.4.22.tar.gz siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-siren7-1.4.22.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-siren14-1.4.22.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-sln16-1.4.22.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-ulaw-1.4.22.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-wav-1.4.22.tar.gz ) ) linguas_ru? ( alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-alaw-1.4.22.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-g722-1.4.22.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-g729-1.4.22.tar.gz ) http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-gsm-1.4.22.tar.gz siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-siren7-1.4.22.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-siren14-1.4.22.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-sln16-1.4.22.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-ulaw-1.4.22.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-wav-1.4.22.tar.gz ) )
-_md5_=64319a178b1e31145d6bf4d4626df24b
+SRC_URI=alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.4.22.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-1.4.22.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-1.4.22.tar.gz ) http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.4.22.tar.gz siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-siren7-1.4.22.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-siren14-1.4.22.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-sln16-1.4.22.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-1.4.22.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-1.4.22.tar.gz ) l10n_fr? ( alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-alaw-1.4.22.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-g722-1.4.22.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-g729-1.4.22.tar.gz ) http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-gsm-1.4.22.tar.gz siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-siren7-1.4.22.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-siren14-1.4.22.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-sln16-1.4.22.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-ulaw-1.4.22.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-wav-1.4.22.tar.gz ) ) l10n_es? ( alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-alaw-1.4.22.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-g722-1.4.22.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-g729-1.4.22.tar.gz ) http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-gsm-1.4.22.tar.gz siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-siren7-1.4.22.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-siren14-1.4.22.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-sln16-1.4.22.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-ulaw-1.4.22.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-wav-1.4.22.tar.gz ) ) l10n_ru? ( alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-alaw-1.4.22.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-g722-1.4.22.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-g729-1.4.22.tar.gz ) http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-gsm-1.4.22.tar.gz siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-siren7-1.4.22.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-siren14-1.4.22.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-sln16-1.4.22.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-ulaw-1.4.22.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-wav-1.4.22.tar.gz ) )
+_md5_=46f2034d61f86bf84a656da139f4a45e
diff --git a/metadata/md5-cache/net-misc/asterisk-extra-sounds-1.4.11 b/metadata/md5-cache/net-misc/asterisk-extra-sounds-1.4.11
index 1e76a5deedbd..a8e3e40ade4a 100644
--- a/metadata/md5-cache/net-misc/asterisk-extra-sounds-1.4.11
+++ b/metadata/md5-cache/net-misc/asterisk-extra-sounds-1.4.11
@@ -3,10 +3,10 @@ DEPEND=>=net-misc/asterisk-1.4
 DESCRIPTION=Extra sounds for asterisk
 EAPI=2
 HOMEPAGE=http://www.asterisk.org/
-IUSE=alaw g722 g729 +gsm siren7 siren14 sln16 ulaw wav linguas_fr
+IUSE=alaw g722 g729 +gsm siren7 siren14 sln16 ulaw wav l10n_fr
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=CC-BY-SA-3.0
 RDEPEND=>=net-misc/asterisk-1.4
 SLOT=0
-SRC_URI=alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-1.4.11.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g722-1.4.11.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-1.4.11.tar.gz ) gsm? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz ) siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-siren7-1.4.11.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-siren14-1.4.11.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-sln16-1.4.11.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-1.4.11.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-wav-1.4.11.tar.gz ) linguas_fr? ( alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-alaw-1.4.11.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-g722-1.4.11.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-g729-1.4.11.tar.gz ) gsm? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-gsm-1.4.11.tar.gz ) siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-siren7-1.4.11.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-siren14-1.4.11.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-sln16-1.4.11.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-ulaw-1.4.11.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-wav-1.4.11.tar.gz ) )
-_md5_=a7602b67e7d20e0fe2253a0f75e2953e
+SRC_URI=alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-1.4.11.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g722-1.4.11.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-1.4.11.tar.gz ) gsm? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz ) siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-siren7-1.4.11.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-siren14-1.4.11.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-sln16-1.4.11.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-1.4.11.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-wav-1.4.11.tar.gz ) l10n_fr? ( alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-alaw-1.4.11.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-g722-1.4.11.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-g729-1.4.11.tar.gz ) gsm? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-gsm-1.4.11.tar.gz ) siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-siren7-1.4.11.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-siren14-1.4.11.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-sln16-1.4.11.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-ulaw-1.4.11.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-wav-1.4.11.tar.gz ) )
+_md5_=8f4e94480a30ec81f2043639519a0704
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 4768695facdc..aa2f7ea665bc 100644
--- a/metadata/md5-cache/net-p2p/Manifest.gz
+++ b/metadata/md5-cache/net-p2p/Manifest.gz
diff --git a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1475-r2 b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1480
index e43ec72969b9..b428cec15cb4 100644
--- a/metadata/md5-cache/net-p2p/freenet-0.7.5_p1475-r2
+++ b/metadata/md5-cache/net-p2p/freenet-0.7.5_p1480
@@ -10,6 +10,6 @@ PDEPEND=net-libs/NativeThread:0
 RDEPEND=>=virtual/jre-1.7 net-libs/nativebiginteger:0 dev-java/bcprov:1.54 dev-java/commons-compress:0 dev-java/fec:0 dev-java/java-service-wrapper:0 dev-java/jbitcollider-core:0 dev-java/lzma:0 dev-java/lzmajio:0 dev-java/mersennetwister:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/freenet/fred/archive/build01475.zip -> freenet-0.7.5_p1475.zip mirror://gentoo/seednodes-20150812.fref.bz2 mirror://gentoo/freenet-ant-1.7.1.jar
+SRC_URI=https://github.com/freenet/fred/archive/build01480.zip -> freenet-0.7.5_p1480.zip https://github.com/freenet/seedrefs/archive/build01480.zip -> seednodes-0.7.5_p1480.zip mirror://gentoo/freenet-ant-1.7.1.jar
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1538424d938ff8eba9f4161d942652d4
+_md5_=f05b8f53e320fb902e318600c27c9852
diff --git a/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.13 b/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.13
index d34aef2b157e..1d08e41e7a3e 100644
--- a/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.13
+++ b/metadata/md5-cache/net-p2p/go-ipfs-bin-0.4.13
@@ -3,9 +3,9 @@ DESCRIPTION=go-ipfs is the main implementation of IPFS.
 EAPI=6
 HOMEPAGE=https://ipfs.io/
 IUSE=+fuse
-KEYWORDS=-* ~x86 ~amd64
+KEYWORDS=-* ~amd64 ~arm ~x86
 LICENSE=MIT
 RDEPEND=fuse? ( sys-fs/fuse )
 SLOT=0
-SRC_URI=amd64? ( https://dist.ipfs.io/go-ipfs/v0.4.13/go-ipfs_v0.4.13_linux-amd64.tar.gz ) x86? ( https://dist.ipfs.io/go-ipfs/v0.4.13/go-ipfs_v0.4.13_linux-386.tar.gz )
-_md5_=43d1e63182c6979e75acf701d60680ad
+SRC_URI=amd64? ( https://dist.ipfs.io/go-ipfs/v0.4.13/go-ipfs_v0.4.13_linux-amd64.tar.gz ) x86? ( https://dist.ipfs.io/go-ipfs/v0.4.13/go-ipfs_v0.4.13_linux-386.tar.gz ) arm? ( https://dist.ipfs.io/go-ipfs/v0.4.13/go-ipfs_v0.4.13_linux-arm.tar.gz )
+_md5_=6314020b144e6dee3d15b27d0dec699b
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 80fc023e4123..87aa419680b6 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/pnm2ppa-1.13-r1 b/metadata/md5-cache/net-print/pnm2ppa-1.13-r1
index cbc7ffa521ed..600846900967 100644
--- a/metadata/md5-cache/net-print/pnm2ppa-1.13-r1
+++ b/metadata/md5-cache/net-print/pnm2ppa-1.13-r1
@@ -3,11 +3,11 @@ DEPEND=app-text/ghostscript-gpl net-print/cups || ( >=net-print/cups-filters-1.0
 DESCRIPTION=Print driver for Hp Deskjet 710, 712, 720, 722, 820, 1000 series
 EAPI=4
 HOMEPAGE=http://pnm2ppa.sourceforge.net
-IUSE=syslog linguas_en linguas_cs linguas_es linguas_fr linguas_it linguas_nl
+IUSE=syslog l10n_en l10n_cs l10n_es l10n_fr l10n_it l10n_nl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-text/ghostscript-gpl net-print/cups || ( >=net-print/cups-filters-1.0.43-r1[foomatic] net-print/foomatic-filters ) sys-libs/glibc syslog? ( virtual/logger )
 SLOT=0
 SRC_URI=mirror://sourceforge/pnm2ppa/pnm2ppa-1.13.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2d390e0ed62de0192a5939198ff3ba24
+_md5_=57eb6b11c88689ca10cfd1e9f87f0123
diff --git a/metadata/md5-cache/ros-meta/Manifest.gz b/metadata/md5-cache/ros-meta/Manifest.gz
index 47f3932198bd..0bd1f7eac496 100644
--- a/metadata/md5-cache/ros-meta/Manifest.gz
+++ b/metadata/md5-cache/ros-meta/Manifest.gz
diff --git a/metadata/md5-cache/ros-meta/geometry_experimental-0.5.17 b/metadata/md5-cache/ros-meta/geometry_experimental-0.5.17
new file mode 100644
index 000000000000..a09949be8a88
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/geometry_experimental-0.5.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/test_tf2 dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ros/tf2_geometry_msgs dev-ros/tf2_kdl dev-ros/tf2_msgs dev-ros/tf2_py dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-ros/tf2_tools sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=The second generation Transform Library in ros
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/geometry_experimental
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/test_tf2 dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_eigen dev-ros/tf2_geometry_msgs dev-ros/tf2_kdl dev-ros/tf2_msgs dev-ros/tf2_py dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-ros/tf2_tools python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros/geometry2/archive/0.5.17.tar.gz -> geometry2-0.5.17.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=93e08822946508b520a6c697ee3d7a7d
diff --git a/metadata/md5-cache/ros-meta/visualization_tutorials-0.10.2 b/metadata/md5-cache/ros-meta/visualization_tutorials-0.10.2
new file mode 100644
index 000000000000..abcfdc8eb52e
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/visualization_tutorials-0.10.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/interactive_marker_tutorials dev-ros/librviz_tutorial dev-ros/rviz_plugin_tutorials dev-ros/rviz_python_tutorial dev-ros/visualization_marker_tutorials sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Metapackage referencing tutorials related to rviz and visualization
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/visualization_tutorials
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/interactive_marker_tutorials dev-ros/librviz_tutorial dev-ros/rviz_plugin_tutorials dev-ros/rviz_python_tutorial dev-ros/visualization_marker_tutorials python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.2.tar.gz -> visualization_tutorials-0.10.2.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cc38bcaa2881f92fa3ae6c5497be25b3
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 1f20275ce14d..c0fa3329061d 100644
--- a/metadata/md5-cache/sci-electronics/Manifest.gz
+++ b/metadata/md5-cache/sci-electronics/Manifest.gz
diff --git a/metadata/md5-cache/sci-electronics/cirkuit-0.4.3-r1 b/metadata/md5-cache/sci-electronics/cirkuit-0.4.3-r1
deleted file mode 100644
index d45e381bf28a..000000000000
--- a/metadata/md5-cache/sci-electronics/cirkuit-0.4.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-text/poppler-0.12.3-r3[qt4] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2 dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-DESCRIPTION=An application to generate publication-ready figures
-EAPI=5
-HOMEPAGE=http://wwwu.uni-klu.ac.at/magostin/cirkuit.html
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.12.3-r3[qt4] app-text/ghostscript-gpl app-text/ps2eps dev-texlive/texlive-pstricks media-gfx/dpic media-gfx/pdf2svg media-libs/netpbm virtual/latex-base kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-SLOT=4
-SRC_URI=http://wwwu.uni-klu.ac.at/magostin/src/cirkuit-0.4.3.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=00f293b6e2b5eed289a2dc7c3a607489
diff --git a/metadata/md5-cache/sci-electronics/cirkuit-0.4.3_p201710115 b/metadata/md5-cache/sci-electronics/cirkuit-0.4.3_p201710115
new file mode 100644
index 000000000000..0c238426652c
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/cirkuit-0.4.3_p201710115
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-text/poppler[qt5] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Application to generate publication-ready figures
+EAPI=6
+HOMEPAGE=https://wwwu.uni-klu.ac.at/magostin/cirkuit.html
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-text/poppler[qt5] app-text/ghostscript-gpl app-text/ps2eps dev-texlive/texlive-pstricks media-gfx/dpic media-gfx/pdf2svg media-libs/netpbm virtual/latex-base >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=https://github.com/KDE/cirkuit/archive/d9ff4c17d052c8d1bb648402e88d70d77897f847.tar.gz -> cirkuit-0.4.3_p201710115.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b58c8b1029cc772c74515603820ca2ea
diff --git a/metadata/md5-cache/sci-electronics/gazebo-8.1.1 b/metadata/md5-cache/sci-electronics/gazebo-8.1.1
deleted file mode 100644
index bbf473411503..000000000000
--- a/metadata/md5-cache/sci-electronics/gazebo-8.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml dev-libs/tinyxml2:= dev-libs/libtar dev-cpp/tbb >=dev-games/ogre-1.7.4[freeimage] >=media-libs/freeimage-3.15.4[png] sci-libs/libccd libav? ( >=media-video/libav-9:0= ) !libav? ( >=media-video/ffmpeg-2.6:0= ) sci-libs/gts >=sci-physics/bullet-2.82 >=dev-libs/sdformat-5.0:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads] sci-libs/gdal virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:= >=sci-libs/ignition-math-2.3:3= net-libs/ignition-transport:3= x11-libs/qwt:6=[qt5] dev-qt/qttest:5 app-text/ronn app-arch/gzip virtual/pkgconfig x11-apps/mesa-progs test? ( dev-libs/libxslt ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A 3D multiple robot simulator with dynamics
-EAPI=5
-HOMEPAGE=http://gazebosim.org/
-IUSE=cpu_flags_x86_sse2 libav test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml dev-libs/tinyxml2:= dev-libs/libtar dev-cpp/tbb >=dev-games/ogre-1.7.4[freeimage] >=media-libs/freeimage-3.15.4[png] sci-libs/libccd libav? ( >=media-video/libav-9:0= ) !libav? ( >=media-video/ffmpeg-2.6:0= ) sci-libs/gts >=sci-physics/bullet-2.82 >=dev-libs/sdformat-5.0:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads] sci-libs/gdal virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:= >=sci-libs/ignition-math-2.3:3= net-libs/ignition-transport:3= x11-libs/qwt:6=[qt5]
-SLOT=0/8
-SRC_URI=https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-8.1.1.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3a199543d17d2b2d1ec3ed688dec50a1
diff --git a/metadata/md5-cache/sci-electronics/gazebo-8.2.0 b/metadata/md5-cache/sci-electronics/gazebo-8.2.0-r1
index 14d564a05146..cbb0bda3dba4 100644
--- a/metadata/md5-cache/sci-electronics/gazebo-8.2.0
+++ b/metadata/md5-cache/sci-electronics/gazebo-8.2.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar dev-cpp/tbb >=dev-games/ogre-1.7.4[freeimage] >=media-libs/freeimage-3.15.4[png] sci-libs/libccd libav? ( >=media-video/libav-9:0= ) !libav? ( >=media-video/ffmpeg-2.6:0= ) sci-libs/gts >=sci-physics/bullet-2.82 >=dev-libs/sdformat-5.0:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:= >=sci-libs/ignition-math-2.3:3= net-libs/ignition-transport:3= x11-libs/qwt:6=[qt5] dev-qt/qttest:5 app-text/ronn app-arch/gzip virtual/pkgconfig x11-apps/mesa-progs test? ( dev-libs/libxslt ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar dev-cpp/tbb >=dev-games/ogre-1.7.4[freeimage] >=media-libs/freeimage-3.15.4[png] sci-libs/libccd libav? ( >=media-video/libav-9:0= ) !libav? ( >=media-video/ffmpeg-2.6:0= ) sci-libs/gts >=sci-physics/bullet-2.82 >=dev-libs/sdformat-5.0:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:0= >=sci-libs/ignition-math-2.3:3= net-libs/ignition-transport:3= x11-libs/qwt:6=[qt5] dev-qt/qttest:5 app-text/ronn app-arch/gzip virtual/pkgconfig x11-apps/mesa-progs test? ( dev-libs/libxslt ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=A 3D multiple robot simulator with dynamics
 EAPI=5
 HOMEPAGE=http://gazebosim.org/
 IUSE=cpu_flags_x86_sse2 libav test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar dev-cpp/tbb >=dev-games/ogre-1.7.4[freeimage] >=media-libs/freeimage-3.15.4[png] sci-libs/libccd libav? ( >=media-video/libav-9:0= ) !libav? ( >=media-video/ffmpeg-2.6:0= ) sci-libs/gts >=sci-physics/bullet-2.82 >=dev-libs/sdformat-5.0:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:= >=sci-libs/ignition-math-2.3:3= net-libs/ignition-transport:3= x11-libs/qwt:6=[qt5]
+RDEPEND=>=dev-libs/protobuf-2:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml >=dev-libs/tinyxml2-6:= dev-libs/libtar dev-cpp/tbb >=dev-games/ogre-1.7.4[freeimage] >=media-libs/freeimage-3.15.4[png] sci-libs/libccd libav? ( >=media-video/libav-9:0= ) !libav? ( >=media-video/ffmpeg-2.6:0= ) sci-libs/gts >=sci-physics/bullet-2.82 >=dev-libs/sdformat-5.0:= dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-libs/boost:=[threads] sci-libs/gdal:= virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:=[cxx] sys-apps/util-linux media-gfx/graphviz net-libs/ignition-msgs:0= >=sci-libs/ignition-math-2.3:3= net-libs/ignition-transport:3= x11-libs/qwt:6=[qt5]
 SLOT=0/8
 SRC_URI=https://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-8.2.0.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8c2e75b08c8a8b3056dd016caa7dfa5f
+_md5_=e43408281116c04bdf579d0c17ff4d41
diff --git a/metadata/md5-cache/sci-electronics/splat-1.4.2 b/metadata/md5-cache/sci-electronics/splat-1.4.2
index 36bb48405c36..a9dcb920e595 100644
--- a/metadata/md5-cache/sci-electronics/splat-1.4.2
+++ b/metadata/md5-cache/sci-electronics/splat-1.4.2
@@ -3,11 +3,11 @@ DEPEND=sys-libs/zlib app-arch/bzip2
 DESCRIPTION=RF Signal Propagation, Loss, And Terrain analysis tool
 EAPI=5
 HOMEPAGE=http://www.qsl.net/kd2bd/splat.html
-IUSE=doc hires linguas_es
+IUSE=doc hires l10n_es
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib app-arch/bzip2
 SLOT=0
 SRC_URI=http://www.qsl.net/kd2bd/splat-1.4.2.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e21c30e0f214ecc27874cefed0eafb0c
+_md5_=8f2daf63589a1ed8640aba076d73a5d8
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index a9e88299da8c..e810d643994e 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/viking-1.6.2-r1 b/metadata/md5-cache/sci-geosciences/viking-1.6.2-r1
new file mode 100644
index 000000000000..aaf38d7523ef
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/viking-1.6.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=app-arch/bzip2 dev-libs/expat dev-libs/glib:2 net-misc/curl sys-libs/zlib x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 gps? ( >=sci-geosciences/gpsd-2.96 ) exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) ) magic? ( sys-apps/file ) mapnik? ( sci-geosciences/mapnik ) sqlite? ( dev-db/sqlite:3 ) app-text/gnome-doc-utils dev-util/intltool dev-util/gtk-doc-am app-text/rarian dev-libs/libxslt virtual/pkgconfig sys-devel/gettext >=sys-apps/sed-4
+DESCRIPTION=GPS data editor and analyzer
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/viking/
+IUSE=doc +exif libexif gps +magic mapnik nls sqlite
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 dev-libs/expat dev-libs/glib:2 net-misc/curl sys-libs/zlib x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 gps? ( >=sci-geosciences/gpsd-2.96 ) exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) ) magic? ( sys-apps/file ) mapnik? ( sci-geosciences/mapnik ) sqlite? ( dev-db/sqlite:3 ) sci-geosciences/gpsbabel
+SLOT=0
+SRC_URI=mirror://sourceforge/viking/viking-1.6.2.tar.bz2 doc? ( mirror://sourceforge/viking/viking.pdf )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c77457c13d5c1440cc735b02454eb8b5
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index af92b88981a8..a5ba0fbae8d7 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/ignition-math-4.0.0 b/metadata/md5-cache/sci-libs/ignition-math-4.0.0
new file mode 100644
index 000000000000..c93734c8f146
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/ignition-math-4.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-util/ignition-cmake[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/make >=dev-util/cmake-3.7.2
+DESCRIPTION=A small, fast, and high performance math library for robot applications
+EAPI=5
+HOMEPAGE=http://ignitionrobotics.org/libraries/math
+IUSE=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=~amd64
+LICENSE=Apache-2.0
+SLOT=4/4
+SRC_URI=https://bitbucket.org/ignitionrobotics/ign-math/get/ignition-math4_4.0.0.tar.bz2
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=398775be879253fcf759c4589964ff08
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 6c837a8c9916..cec90dfde436 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.38.1 b/metadata/md5-cache/sci-mathematics/maxima-5.38.1
index 7e966abcd851..905c84aa3280 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.38.1
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.38.1
@@ -3,11 +3,11 @@ DEPEND=!app-emacs/imaxima X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd]
 DESCRIPTION=Free computer algebra environment based on Macsyma
 EAPI=5
 HOMEPAGE=http://maxima.sourceforge.net/
-IUSE=emacs tk nls unicode X sbcl cmucl gcl ecls clozurecl clisp linguas_de linguas_es linguas_pt linguas_pt_BR
+IUSE=emacs tk nls unicode X sbcl cmucl gcl ecls clozurecl clisp l10n_de l10n_es l10n_pt l10n_pt-BR
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2 GPL-2+
 RDEPEND=!app-emacs/imaxima X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:0 ) ) emacs? ( virtual/emacs virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended ) clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl:= app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) cmucl? ( dev-lisp/cmucl:= app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( !sbcl? ( arm? ( dev-lisp/gcl:= ) !arm? ( dev-lisp/sbcl:= app-misc/rlwrap ) ) ) ) ) ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/maxima/maxima-5.38.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5d9e19f1fb35ca2f4fef2096250982f8
+_md5_=8ddd62cb06b2490e5811ef9cf3e679dd
diff --git a/metadata/md5-cache/sci-mathematics/maxima-5.41.0 b/metadata/md5-cache/sci-mathematics/maxima-5.41.0
index b7672f95a9ad..3dc1f334d5f9 100644
--- a/metadata/md5-cache/sci-mathematics/maxima-5.41.0
+++ b/metadata/md5-cache/sci-mathematics/maxima-5.41.0
@@ -3,11 +3,11 @@ DEPEND=!app-emacs/imaxima X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd]
 DESCRIPTION=Free computer algebra environment based on Macsyma
 EAPI=5
 HOMEPAGE=http://maxima.sourceforge.net/
-IUSE=emacs tk nls unicode X sbcl cmucl gcl ecls clozurecl clisp linguas_de linguas_es linguas_pt linguas_pt_BR
+IUSE=emacs tk nls unicode X sbcl cmucl gcl ecls clozurecl clisp l10n_de l10n_es l10n_pt l10n_pt-BR
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=GPL-2 GPL-2+
 RDEPEND=!app-emacs/imaxima X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk:0 ) ) emacs? ( virtual/emacs virtual/latex-base app-emacs/auctex app-text/ghostscript-gpl dev-texlive/texlive-latexrecommended ) clisp? ( dev-lisp/clisp:= ) clozurecl? ( dev-lisp/clozurecl:= app-misc/rlwrap ) ecls? ( dev-lisp/ecls:= app-misc/rlwrap ) gcl? ( dev-lisp/gcl:= ) cmucl? ( dev-lisp/cmucl:= app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl:= app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( !sbcl? ( arm? ( dev-lisp/gcl:= ) !arm? ( dev-lisp/sbcl:= app-misc/rlwrap ) ) ) ) ) ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/maxima/maxima-5.41.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=49c68b6efe924d788bb59cc15a9b1f3e
+_md5_=ad91a82c3fb204a73c19e9b3e2a52b91
diff --git a/metadata/md5-cache/sci-physics/Manifest.gz b/metadata/md5-cache/sci-physics/Manifest.gz
index 0f9ac8870271..bfcad9b8fa59 100644
--- a/metadata/md5-cache/sci-physics/Manifest.gz
+++ b/metadata/md5-cache/sci-physics/Manifest.gz
diff --git a/metadata/md5-cache/sci-physics/lightspeed-1.2a-r1 b/metadata/md5-cache/sci-physics/lightspeed-1.2a-r1
index 30589880ec24..a3f7bf3cd3d0 100644
--- a/metadata/md5-cache/sci-physics/lightspeed-1.2a-r1
+++ b/metadata/md5-cache/sci-physics/lightspeed-1.2a-r1
@@ -3,11 +3,11 @@ DEPEND=media-libs/libpng media-libs/tiff virtual/opengl x11-libs/gtkglext x11-li
 DESCRIPTION=OpenGL interactive relativistic simulator
 EAPI=4
 HOMEPAGE=http://lightspeed.sourceforge.net/
-IUSE=nls truetype linguas_es
+IUSE=nls truetype l10n_es
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=media-libs/libpng media-libs/tiff virtual/opengl x11-libs/gtkglext x11-libs/gtkglarea:2 x11-libs/gtk+:2 x11-libs/libXmu truetype? ( media-libs/ftgl )
 SLOT=0
 SRC_URI=mirror://sourceforge/lightspeed/lightspeed-1.2a.tar.gz mirror://sourceforge/lightspeed/objects-1.tar.gz mirror://debian/pool/main/l/lightspeed/lightspeed_1.2a-7.diff.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ce01dde2d380b06f9a43aac0d5cb18ed
+_md5_=c31d97ab874224d15658471d984ad628
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 8fe164e3b372..314e4132c6e6 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/hdparm-9.52 b/metadata/md5-cache/sys-apps/hdparm-9.52
index 26a1692399e3..94a3df4d7b1e 100644
--- a/metadata/md5-cache/sys-apps/hdparm-9.52
+++ b/metadata/md5-cache/sys-apps/hdparm-9.52
@@ -3,9 +3,9 @@ DESCRIPTION=Utility to change hard drive performance parameters
 EAPI=5
 HOMEPAGE=https://sourceforge.net/projects/hdparm/
 IUSE=static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=BSD GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/hdparm/hdparm-9.52.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1ee01d868f83b112a0f83994e48f1ac0
+_md5_=738ac6785a565421e3df34364ff07e22
diff --git a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20161120 b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20161120
index 791abdb33085..07f409468ef4 100644
--- a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20161120
+++ b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20161120
@@ -3,10 +3,10 @@ DEPEND=app-eselect/eselect-awk
 DESCRIPTION=an (often faster than gawk) awk-interpreter
 EAPI=6
 HOMEPAGE=https://invisible-island.net/mawk/mawk.html
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=app-eselect/eselect-awk
 SLOT=0
 SRC_URI=ftp://invisible-island.net/mawk/mawk-1.3.4-20161120.tgz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=549cea48c0e97ff0ee76bd8c1b48b7b3
+_md5_=1b9f43fe2797317af6b68c0fa840d188
diff --git a/metadata/md5-cache/sys-apps/watchdog-5.14 b/metadata/md5-cache/sys-apps/watchdog-5.14
deleted file mode 100644
index cf68ab51f1e9..000000000000
--- a/metadata/md5-cache/sys-apps/watchdog-5.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=nfs? ( net-libs/libtirpc ) virtual/pkgconfig
-DESCRIPTION=A software watchdog and /dev/watchdog daemon
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/watchdog/
-IUSE=nfs
-KEYWORDS=amd64 arm m68k ~mips ppc s390 sh ~sparc x86
-LICENSE=GPL-2
-RDEPEND=nfs? ( net-libs/libtirpc )
-SLOT=0
-SRC_URI=mirror://sourceforge/watchdog/watchdog-5.14.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4094aabad417137faea11848a299c9ea
diff --git a/metadata/md5-cache/sys-apps/watchdog-5.15 b/metadata/md5-cache/sys-apps/watchdog-5.15
index 3e96bcb42cfa..66b8752eb761 100644
--- a/metadata/md5-cache/sys-apps/watchdog-5.15
+++ b/metadata/md5-cache/sys-apps/watchdog-5.15
@@ -4,10 +4,10 @@ DESCRIPTION=A software watchdog and /dev/watchdog daemon
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/watchdog/
 IUSE=nfs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-2
 RDEPEND=nfs? ( net-libs/libtirpc )
 SLOT=0
 SRC_URI=mirror://sourceforge/watchdog/watchdog-5.15.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e4054dc3521141c9c77982f042a75bc0
+_md5_=4c55a22815c98fe5b86d2c4da0e49d4d
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 1ec77475cf87..faed0b92ead5 100644
--- a/metadata/md5-cache/sys-block/Manifest.gz
+++ b/metadata/md5-cache/sys-block/Manifest.gz
diff --git a/metadata/md5-cache/sys-block/ms-sys-2.4.0 b/metadata/md5-cache/sys-block/ms-sys-2.4.0
index 2412502b083c..8f52eb99821f 100644
--- a/metadata/md5-cache/sys-block/ms-sys-2.4.0
+++ b/metadata/md5-cache/sys-block/ms-sys-2.4.0
@@ -3,11 +3,10 @@ DEPEND=sys-devel/gettext
 DESCRIPTION=A command-line program for writing Microsoft compatible boot records
 EAPI=5
 HOMEPAGE=http://ms-sys.sourceforge.net
-IUSE=linguas_sv
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=virtual/libintl
 SLOT=0
 SRC_URI=mirror://sourceforge/ms-sys/ms-sys-2.4.0.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8cbf5529a276787ddacbe1242beff296
+_md5_=9a5b32d5a086e0e0c675fdc8666d5ffd
diff --git a/metadata/md5-cache/sys-block/ms-sys-2.5.3 b/metadata/md5-cache/sys-block/ms-sys-2.5.3
index 169e846211c9..bfa1a2f0d0b4 100644
--- a/metadata/md5-cache/sys-block/ms-sys-2.5.3
+++ b/metadata/md5-cache/sys-block/ms-sys-2.5.3
@@ -3,11 +3,10 @@ DEPEND=sys-devel/gettext
 DESCRIPTION=A command-line program for writing Microsoft compatible boot records
 EAPI=6
 HOMEPAGE=http://ms-sys.sourceforge.net
-IUSE=linguas_sv
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/libintl
 SLOT=0
 SRC_URI=mirror://sourceforge/ms-sys/ms-sys-2.5.3.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4cc12467ef409efa293f5945d6f077ff
+_md5_=ac3336b159d68f7a3a21f4a30b99e07b
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index e15ffc3732bc..abac3cdeeab2 100644
--- a/metadata/md5-cache/sys-boot/Manifest.gz
+++ b/metadata/md5-cache/sys-boot/Manifest.gz
diff --git a/metadata/md5-cache/sys-boot/unetbootin-625 b/metadata/md5-cache/sys-boot/unetbootin-625
index 6ee94fb8458f..5184d70fab18 100644
--- a/metadata/md5-cache/sys-boot/unetbootin-625
+++ b/metadata/md5-cache/sys-boot/unetbootin-625
@@ -3,11 +3,10 @@ DEPEND=dev-qt/qtgui:4
 DESCRIPTION=UNetbootin installs Linux/BSD distributions to a partition or USB drive
 EAPI=5
 HOMEPAGE=https://github.com/unetbootin/unetbootin
-IUSE=linguas_am linguas_ar linguas_ast linguas_be linguas_bg linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_gl linguas_he linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_lt linguas_lv linguas_ml linguas_ms linguas_nan linguas_nb linguas_nl linguas_nn linguas_pl linguas_pt_BR linguas_pt linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sr linguas_sv linguas_sw linguas_tr linguas_uk linguas_ur linguas_vi linguas_zh_CN linguas_zh_TW
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui:4 app-arch/p7zip sys-boot/syslinux sys-fs/mtools
 SLOT=0
 SRC_URI=https://github.com/unetbootin/unetbootin/archive/625.tar.gz -> unetbootin-625.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6ee16e3496d287c8ad71ebe67a8be662
+_md5_=3d4f10b1a8f15091b55cd90a4c909782
diff --git a/metadata/md5-cache/sys-boot/unetbootin-647 b/metadata/md5-cache/sys-boot/unetbootin-647
index 332b45b668c0..071b49aacdb5 100644
--- a/metadata/md5-cache/sys-boot/unetbootin-647
+++ b/metadata/md5-cache/sys-boot/unetbootin-647
@@ -3,11 +3,10 @@ DEPEND=dev-qt/qtgui:4
 DESCRIPTION=UNetbootin installs Linux/BSD distributions to a partition or USB drive
 EAPI=6
 HOMEPAGE=https://github.com/unetbootin/unetbootin
-IUSE=linguas_am linguas_ar linguas_ast linguas_be linguas_bg linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_gl linguas_he linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_lt linguas_lv linguas_ml linguas_ms linguas_nan linguas_nb linguas_nl linguas_nn linguas_pl linguas_pt_BR linguas_pt linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sr linguas_sv linguas_sw linguas_tr linguas_uk linguas_ur linguas_vi linguas_zh_CN linguas_zh_TW
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui:4 app-arch/p7zip sys-boot/syslinux sys-fs/mtools
 SLOT=0
 SRC_URI=https://github.com/unetbootin/unetbootin/archive/647.tar.gz -> unetbootin-647.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8404fff2127d8b4487188b95b435f2bc
+_md5_=338ed98d97115f276953ec3188bf11f1
diff --git a/metadata/md5-cache/sys-boot/unetbootin-655 b/metadata/md5-cache/sys-boot/unetbootin-655
index 33bcf5cb4cf3..0d1575ec9747 100644
--- a/metadata/md5-cache/sys-boot/unetbootin-655
+++ b/metadata/md5-cache/sys-boot/unetbootin-655
@@ -3,11 +3,10 @@ DEPEND=dev-qt/qtgui:4
 DESCRIPTION=UNetbootin installs Linux/BSD distributions to a partition or USB drive
 EAPI=6
 HOMEPAGE=https://github.com/unetbootin/unetbootin
-IUSE=linguas_am linguas_ar linguas_ast linguas_be linguas_bg linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_gl linguas_he linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_lt linguas_lv linguas_ml linguas_ms linguas_nan linguas_nb linguas_nl linguas_nn linguas_pl linguas_pt_BR linguas_pt linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sr linguas_sv linguas_sw linguas_tr linguas_uk linguas_ur linguas_vi linguas_zh_CN linguas_zh_TW
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui:4 app-arch/p7zip sys-boot/syslinux sys-fs/mtools
 SLOT=0
 SRC_URI=https://github.com/unetbootin/unetbootin/archive/655.tar.gz -> unetbootin-655.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0e32bd2a64e81104fbed62a6bd7aa61f
+_md5_=4bdfe9990a88ca366cc9220130f0b6eb
diff --git a/metadata/md5-cache/sys-boot/unetbootin-657 b/metadata/md5-cache/sys-boot/unetbootin-657
index 39675cd55772..8a70a520aa75 100644
--- a/metadata/md5-cache/sys-boot/unetbootin-657
+++ b/metadata/md5-cache/sys-boot/unetbootin-657
@@ -3,11 +3,10 @@ DEPEND=dev-qt/qtgui:4
 DESCRIPTION=UNetbootin installs Linux/BSD distributions to a partition or USB drive
 EAPI=6
 HOMEPAGE=https://github.com/unetbootin/unetbootin
-IUSE=linguas_am linguas_ar linguas_ast linguas_be linguas_bg linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_eo linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fo linguas_fr linguas_gl linguas_he linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_lt linguas_lv linguas_ml linguas_ms linguas_nan linguas_nb linguas_nl linguas_nn linguas_pl linguas_pt_BR linguas_pt linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sr linguas_sv linguas_sw linguas_tr linguas_uk linguas_ur linguas_vi linguas_zh_CN linguas_zh_TW
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui:4 app-arch/p7zip sys-boot/syslinux sys-fs/mtools
 SLOT=0
 SRC_URI=https://github.com/unetbootin/unetbootin/archive/657.tar.gz -> unetbootin-657.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0e32bd2a64e81104fbed62a6bd7aa61f
+_md5_=4bdfe9990a88ca366cc9220130f0b6eb
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 8ba0a81d2c3f..0879ccbce9de 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/keepalived-1.3.5 b/metadata/md5-cache/sys-cluster/keepalived-1.3.5
index 5828bd9df8df..f3bb2f10115f 100644
--- a/metadata/md5-cache/sys-cluster/keepalived-1.3.5
+++ b/metadata/md5-cache/sys-cluster/keepalived-1.3.5
@@ -4,10 +4,10 @@ DESCRIPTION=A strong & robust keepalive facility to the Linux Virtual Server pro
 EAPI=6
 HOMEPAGE=http://www.keepalived.org/
 IUSE=dbus debug ipv6 snmp
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 hppa ia64 ppc ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libnl:= dev-libs/openssl:= dev-libs/popt net-libs/libnfnetlink sys-apps/iproute2 dbus? ( sys-apps/dbus ) snmp? ( net-analyzer/net-snmp )
 SLOT=0
 SRC_URI=http://www.keepalived.org/software/keepalived-1.3.5.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b65631d90700fdb856c7817b3a5eacf2
+_md5_=0d72b1361ca7b24cf72d1421da004fa7
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index fb7cfb4c3aa5..3f9d1fca830f 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/autoconf-2.69-r4 b/metadata/md5-cache/sys-devel/autoconf-2.69-r4
index 9a55410704ef..89de3958f359 100644
--- a/metadata/md5-cache/sys-devel/autoconf-2.69-r4
+++ b/metadata/md5-cache/sys-devel/autoconf-2.69-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Used to create autoconfiguration files
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
 IUSE=emacs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 PDEPEND=emacs? ( app-emacs/autoconf-mode )
 RDEPEND=>=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6 !~sys-devel/autoconf-2.69:2.5 >=sys-devel/autoconf-wrapper-13
 SLOT=2.69
 SRC_URI=mirror://gnu/autoconf/autoconf-2.69.tar.xz ftp://alpha.gnu.org/pub/gnu/autoconf/autoconf-2.69.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-autoconf	060906d07621f8c91c5ac52ede20858e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b066c6448e264187f0c147451f074c0e
+_md5_=6cbf37b56ef520d48fea61df824d89c4
diff --git a/metadata/md5-cache/sys-devel/bc-1.06.95-r2 b/metadata/md5-cache/sys-devel/bc-1.06.95-r2
index 63bd1fa86057..ce2347408ae3 100644
--- a/metadata/md5-cache/sys-devel/bc-1.06.95-r2
+++ b/metadata/md5-cache/sys-devel/bc-1.06.95-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Handy console-based calculator utility
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/bc/bc.html
 IUSE=libedit readline static
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=!readline? ( libedit? ( dev-libs/libedit:= ) ) readline? ( >=sys-libs/readline-4.1:0= >=sys-libs/ncurses-5.2:= )
 SLOT=0
 SRC_URI=mirror://gnu-alpha/bc/bc-1.06.95.tar.bz2 mirror://gnu/bc/bc-1.06.95.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b5af4ee0a7a30147b5a40ef3adcb5e64
+_md5_=1081487791852c5197961ab677df4037
diff --git a/metadata/md5-cache/sys-devel/crossdev-20151026-r1 b/metadata/md5-cache/sys-devel/crossdev-20151026-r1
deleted file mode 100644
index 89b6f50c6615..000000000000
--- a/metadata/md5-cache/sys-devel/crossdev-20151026-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Gentoo Cross-toolchain generator
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions !sys-devel/crossdev-wrappers
-SLOT=0
-SRC_URI=mirror://gentoo/crossdev-20151026.tar.xz https://dev.gentoo.org/~vapier/dist/crossdev-20151026.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=af72b3fb25c821d5898d108ef4467985
diff --git a/metadata/md5-cache/sys-devel/crossdev-20171119 b/metadata/md5-cache/sys-devel/crossdev-20171119
deleted file mode 100644
index 88c484d634f1..000000000000
--- a/metadata/md5-cache/sys-devel/crossdev-20171119
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Gentoo Cross-toolchain generator
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions !sys-devel/crossdev-wrappers
-SLOT=0
-SRC_URI=mirror://gentoo/crossdev-20171119.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20171119.tar.xz
-_md5_=afef57e35a6cd0488e59993ca7977293
diff --git a/metadata/md5-cache/sys-devel/crossdev-20171227 b/metadata/md5-cache/sys-devel/crossdev-20171227
deleted file mode 100644
index 539950d77ff1..000000000000
--- a/metadata/md5-cache/sys-devel/crossdev-20171227
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Gentoo Cross-toolchain generator
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions !sys-devel/crossdev-wrappers
-SLOT=0
-SRC_URI=mirror://gentoo/crossdev-20171227.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20171227.tar.xz
-_md5_=afef57e35a6cd0488e59993ca7977293
diff --git a/metadata/md5-cache/sys-devel/crossdev-20171230 b/metadata/md5-cache/sys-devel/crossdev-20171230
index d987f19fd153..8bb75eec3661 100644
--- a/metadata/md5-cache/sys-devel/crossdev-20171230
+++ b/metadata/md5-cache/sys-devel/crossdev-20171230
@@ -3,9 +3,9 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Gentoo Cross-toolchain generator
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions !sys-devel/crossdev-wrappers
 SLOT=0
 SRC_URI=mirror://gentoo/crossdev-20171230.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20171230.tar.xz
-_md5_=afef57e35a6cd0488e59993ca7977293
+_md5_=cb7a481874523b9e7bcb329c74a92603
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index bd786f983f12..26538446e4f2 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/e2fsprogs-1.43.8 b/metadata/md5-cache/sys-fs/e2fsprogs-1.43.8
index 83db8d07b22c..0f111c90cc21 100644
--- a/metadata/md5-cache/sys-fs/e2fsprogs-1.43.8
+++ b/metadata/md5-cache/sys-fs/e2fsprogs-1.43.8
@@ -10,4 +10,4 @@ RDEPEND=~sys-libs/e2fsprogs-libs-1.43.8 >=sys-apps/util-linux-2.16 fuse? ( sys-f
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-1.43.8.tar.gz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.43.8/e2fsprogs-1.43.8.tar.gz elibc_mintlib? ( mirror://gentoo/e2fsprogs-1.42.9-mint-r1.patch.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c887cc31421c8db747462e28592cc57f
+_md5_=356ad896434d94957dd13d4b461ea6d3
diff --git a/metadata/md5-cache/sys-fs/udftools-1.1 b/metadata/md5-cache/sys-fs/udftools-1.1-r1
index 8e2a5e94a155..cf6fb45a634c 100644
--- a/metadata/md5-cache/sys-fs/udftools-1.1
+++ b/metadata/md5-cache/sys-fs/udftools-1.1-r1
@@ -9,4 +9,4 @@ RDEPEND=sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/pali/udftools/releases/download/1.1/udftools-1.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1171a60b487550566a082ddde688ad55
+_md5_=e9b9ce26b378e817b55bbfb670e4795e
diff --git a/metadata/md5-cache/sys-fs/udftools-1.3 b/metadata/md5-cache/sys-fs/udftools-1.3-r1
index e96aae7353c1..ab570b3239da 100644
--- a/metadata/md5-cache/sys-fs/udftools-1.3
+++ b/metadata/md5-cache/sys-fs/udftools-1.3-r1
@@ -9,4 +9,4 @@ RDEPEND=sys-libs/readline:0=
 SLOT=0
 SRC_URI=https://github.com/pali/udftools/releases/download/1.3/udftools-1.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=30cd9c78996422fc8a86a0cad107f3c2
+_md5_=950bacd4b3a8227d1a581f480b0510b3
diff --git a/metadata/md5-cache/sys-fs/udftools-2.0 b/metadata/md5-cache/sys-fs/udftools-2.0-r1
index 4eede9853be3..4eede9853be3 100644
--- a/metadata/md5-cache/sys-fs/udftools-2.0
+++ b/metadata/md5-cache/sys-fs/udftools-2.0-r1
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 3883acad4652..b820b086d2a0 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/dracut-046 b/metadata/md5-cache/sys-kernel/dracut-046-r1
index 07e475df4e18..66f43ec4e00b 100644
--- a/metadata/md5-cache/sys-kernel/dracut-046
+++ b/metadata/md5-cache/sys-kernel/dracut-046-r1
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-046.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7723ebd5a1d09967a55f7cfa9f1baa28
+_md5_=f1d2c7e11b8894f330123028e888049b
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.11.12 b/metadata/md5-cache/sys-kernel/mips-sources-4.11.12
deleted file mode 100644
index b67c9b3ef6ae..000000000000
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.11.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=>=sys-devel/gcc-4.7.0 >=sys-devel/patch-2.7.4 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Linux-Mips GIT sources for MIPS-based machines, dated 20170513
-EAPI=5
-HOMEPAGE=https://www.linux-mips.org/ https://www.gentoo.org/
-IUSE=experimental ip27 ip28 ip30 symlink build
-KEYWORDS=-* ~mips
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.11.12
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.11.12.xz mirror://kernel/linux/kernel/v4.x/linux-4.11.tar.xz mirror://gentoo/mipsgit-4.11.0-20170513.diff.xz mirror://gentoo/mips-sources-4.11.0-patches-v1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	acc3c4cb9ec833aefc2d4ac61704a1ed	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=5535845c695c99759a9a002b10ee16c9
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.12.14 b/metadata/md5-cache/sys-kernel/mips-sources-4.13.16
index c0841ec7c122..66719deaeac7 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.12.14
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.13.16
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
 DEPEND=>=sys-devel/gcc-4.7.0 >=sys-devel/patch-2.7.4 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
-DESCRIPTION=Linux-Mips GIT sources for MIPS-based machines, dated 20170703
+DESCRIPTION=Linux-Mips GIT sources for MIPS-based machines, dated 20171007
 EAPI=5
 HOMEPAGE=https://www.linux-mips.org/ https://www.gentoo.org/
 IUSE=experimental ip27 ip28 ip30 symlink build
@@ -8,7 +8,7 @@ KEYWORDS=-* ~mips
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.12.14
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.12.14.xz mirror://kernel/linux/kernel/v4.x/linux-4.12.tar.xz mirror://gentoo/mipsgit-4.12.0-20170703.diff.xz mirror://gentoo/mips-sources-4.12.0-patches-v1.tar.xz
+SLOT=4.13.16
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.13.16.xz mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz mirror://gentoo/mipsgit-4.13.0-20171007.diff.xz mirror://gentoo/mips-sources-4.13.0-patches-v1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	acc3c4cb9ec833aefc2d4ac61704a1ed	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d56265f0acb41cfa31ada5308deedf07
+_md5_=fd16c76b17929cd96bd582501543d6d5
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.4.91 b/metadata/md5-cache/sys-kernel/mips-sources-4.4.110
index 35245b9df881..9970caf9f8b8 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.4.91
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.4.110
@@ -8,7 +8,7 @@ KEYWORDS=-* ~mips
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.4.91
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.91.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/mipsgit-4.4.0-20160123.diff.xz mirror://gentoo/mips-sources-4.4.0-patches-v2.tar.xz
+SLOT=4.4.110
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.110.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/mipsgit-4.4.0-20160123.diff.xz mirror://gentoo/mips-sources-4.4.0-patches-v2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	acc3c4cb9ec833aefc2d4ac61704a1ed	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=56f4e8effbc5a04a7d094136c2b3bd85
+_md5_=9579181066f0c33427b38908b436b0c0
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.9.54 b/metadata/md5-cache/sys-kernel/mips-sources-4.9.75
index 573c5edcdb31..9da369989d98 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.9.54
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.9.75
@@ -8,7 +8,7 @@ KEYWORDS=-* ~mips
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.9.54
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.54.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/mipsgit-4.9.0-20161216.diff.xz mirror://gentoo/mips-sources-4.9.0-patches-v1.tar.xz
+SLOT=4.9.75
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.9.75.xz mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/mipsgit-4.9.0-20161216.diff.xz mirror://gentoo/mips-sources-4.9.0-patches-v1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	kernel-2	acc3c4cb9ec833aefc2d4ac61704a1ed	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3ba593d232a0723548ca0bac1e4982dc
+_md5_=ddb86dac3656126a578ea9a644628b3e
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 4f52c4f24ba2..20ca8a3d5e43 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/gdbm-1.13-r2 b/metadata/md5-cache/sys-libs/gdbm-1.13-r2
index f0f69cbaffe3..140d49da667f 100644
--- a/metadata/md5-cache/sys-libs/gdbm-1.13-r2
+++ b/metadata/md5-cache/sys-libs/gdbm-1.13-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Standard GNU database libraries
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/gdbm/
 IUSE=+berkdb exporter nls +readline 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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/1.13
 SRC_URI=mirror://gnu/gdbm/gdbm-1.13.tar.gz exporter? ( mirror://gnu/gdbm/gdbm-1.8.3.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=23dc69b589c31c6337ca8c9e906b42ba
+_md5_=978bff8d5768bbf14196fd7a92b8ee26
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index d61308eca710..fb32195a8237 100644
--- a/metadata/md5-cache/sys-power/Manifest.gz
+++ b/metadata/md5-cache/sys-power/Manifest.gz
diff --git a/metadata/md5-cache/sys-power/apcupsd-3.14.14-r1 b/metadata/md5-cache/sys-power/apcupsd-3.14.14-r1
index f5cef4dfea8b..065f44ca57a5 100644
--- a/metadata/md5-cache/sys-power/apcupsd-3.14.14-r1
+++ b/metadata/md5-cache/sys-power/apcupsd-3.14.14-r1
@@ -4,10 +4,10 @@ DESCRIPTION=APC UPS daemon with integrated tcp/ip remote shutdown
 EAPI=5
 HOMEPAGE=http://www.apcupsd.org/
 IUSE=snmp +usb +modbus cgi nls gnome kernel_linux
-KEYWORDS=~amd64 ~arm ~ppc x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ppc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=|| ( >=sys-apps/util-linux-2.23[tty-helpers(-)] sys-freebsd/freebsd-ubin ) modbus? ( usb? ( virtual/libusb:0 ) ) cgi? ( >=media-libs/gd-1.8.4 ) nls? ( sys-devel/gettext ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) gnome? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/glib:2 >=gnome-base/gconf-2.0 ) virtual/mailx
 SLOT=0
 SRC_URI=mirror://sourceforge/apcupsd/apcupsd-3.14.14.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c4ff1f3ee2c338774804f20ef826a1e9
+_md5_=d8ce8a961ca37a94e001d7037ba8f2ad
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index e45ba649c336..d31870d147fb 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/linux-sources-3-r1 b/metadata/md5-cache/virtual/linux-sources-3-r1
new file mode 100644
index 000000000000..bdc8ff3c6609
--- /dev/null
+++ b/metadata/md5-cache/virtual/linux-sources-3-r1
@@ -0,0 +1,8 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for Linux kernel sources
+EAPI=6
+IUSE=firmware
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+RDEPEND=firmware? ( sys-kernel/linux-firmware ) || ( sys-kernel/gentoo-sources sys-kernel/vanilla-sources sys-kernel/ck-sources sys-kernel/git-sources sys-kernel/hardened-sources sys-kernel/mips-sources sys-kernel/pf-sources sys-kernel/rt-sources sys-kernel/xbox-sources sys-kernel/zen-sources sys-kernel/aufs-sources sys-kernel/raspberrypi-sources )
+SLOT=0
+_md5_=9db8ea0197005c7228a510e0ede8dbc4
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 75f2a43e3ab5..fc4282a724b0 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/radicale-1.1.1 b/metadata/md5-cache/www-apps/radicale-1.1.1
index 274dc7aea71b..a144ce768a18 100644
--- a/metadata/md5-cache/www-apps/radicale-1.1.1
+++ b/metadata/md5-cache/www-apps/radicale-1.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=A simple CalDAV calendar server
 EAPI=6
 HOMEPAGE=http://www.radicale.org/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=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://pypi/R/Radicale/Radicale-1.1.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=095612193435cc98acc69d6804916b14
+_md5_=e471d0f8fcc3bcc58c0c6ff026ba5135
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index bb1b2493b142..08ffd8a30823 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/chromium-64.0.3282.24 b/metadata/md5-cache/www-client/chromium-64.0.3282.24
deleted file mode 100644
index 1370f003ff1c..000000000000
--- a/metadata/md5-cache/www-client/chromium-64.0.3282.24
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-6.9.4 sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=6
-HOMEPAGE=http://chromium.org/
-IUSE=component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-64.0.3282.24.tar.xz
-_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b03fa1db09de98ef11ed3598631ab3ca
diff --git a/metadata/md5-cache/www-client/chromium-64.0.3282.71 b/metadata/md5-cache/www-client/chromium-64.0.3282.71
new file mode 100644
index 000000000000..b89b878f624f
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-64.0.3282.71
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-6.9.4 sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=6
+HOMEPAGE=http://chromium.org/
+IUSE=component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-64.0.3282.71.tar.xz
+_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b55a63db536b1d3415584e80915ad4f6
diff --git a/metadata/md5-cache/www-client/chromium-65.0.3298.3 b/metadata/md5-cache/www-client/chromium-65.0.3298.3
index 26542c5b3067..d1ad1d15449b 100644
--- a/metadata/md5-cache/www-client/chromium-65.0.3298.3
+++ b/metadata/md5-cache/www-client/chromium-65.0.3298.3
@@ -3,7 +3,7 @@ DEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups
 DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=6
 HOMEPAGE=http://chromium.org/
-IUSE=component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+IUSE=component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.6.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
@@ -11,4 +11,4 @@ RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-65.0.3298.3.tar.xz
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	portability	2b88d3ecc35035a3b8ab628b49cafb0e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=af921670787b68d1513363f129f90b86
+_md5_=125fd02aa885911869a13b19e541c5a9
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 7fa37dc509c6..1cbdef266010 100644
--- a/metadata/md5-cache/x11-apps/Manifest.gz
+++ b/metadata/md5-cache/x11-apps/Manifest.gz
diff --git a/metadata/md5-cache/x11-apps/xinit-1.3.4-r4 b/metadata/md5-cache/x11-apps/xinit-1.3.4-r4
new file mode 100644
index 000000000000..e79ca5c26ad3
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xinit-1.3.4-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11 >=app-portage/elt-patches-20170422 !<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 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DESCRIPTION=X Window System initializer
+EAPI=5
+HOMEPAGE=https://www.x.org/wiki/
+IUSE=+minimal
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+LICENSE=MIT GPL-2
+PDEPEND=x11-apps/xrdb !minimal? ( x11-apps/xclock x11-apps/xsm x11-terms/xterm x11-wm/twm )
+RDEPEND=!<x11-base/xorg-server-1.8.0 x11-apps/xauth x11-libs/libX11
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xinit-1.3.4.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xorg-2	234cf45e2565fab7c0dff5bd8d1f9177
+_md5_=9ba81d90ae20f394bc510d8f3dbcba12
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index adc23e2f2d11..67913946a30d 100644
--- a/metadata/md5-cache/x11-misc/Manifest.gz
+++ b/metadata/md5-cache/x11-misc/Manifest.gz
diff --git a/metadata/md5-cache/x11-misc/tint2-16.1 b/metadata/md5-cache/x11-misc/tint2-16.1
new file mode 100644
index 000000000000..f0381b6ac48e
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/tint2-16.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=dev-libs/glib:2 svg? ( gnome-base/librsvg:2 ) >=media-libs/imlib2-1.4.2[X,png] x11-libs/cairo[X] x11-libs/pango tint2conf? ( x11-libs/gtk+:2 ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXinerama >=x11-libs/libXrandr-1.3 x11-libs/libXrender startup-notification? ( x11-libs/startup-notification ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=tint2 is a lightweight panel/taskbar for Linux.
+EAPI=6
+HOMEPAGE=https://gitlab.com/o9000/tint2
+IUSE=battery svg startup-notification tint2conf
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 svg? ( gnome-base/librsvg:2 ) >=media-libs/imlib2-1.4.2[X,png] x11-libs/cairo[X] x11-libs/pango tint2conf? ( x11-libs/gtk+:2 ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXinerama >=x11-libs/libXrandr-1.3 x11-libs/libXrender startup-notification? ( x11-libs/startup-notification )
+SLOT=0
+SRC_URI=https://gitlab.com/o9000/tint2/repository/archive.tar.gz?ref=v16.1 -> tint2-16.1.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7d051402203648a3e23a323bd2986384
diff --git a/metadata/md5-cache/x11-misc/xvkbd-3.7 b/metadata/md5-cache/x11-misc/xvkbd-3.7
index ec47007861ee..c9ef87c4b994 100644
--- a/metadata/md5-cache/x11-misc/xvkbd-3.7
+++ b/metadata/md5-cache/x11-misc/xvkbd-3.7
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install prepare
 DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt x11-libs/libXtst app-text/rman x11-misc/gccmakedep x11-misc/imake x11-proto/inputproto x11-proto/xextproto x11-proto/xproto
 DESCRIPTION=virtual keyboard for X window system
 EAPI=5
-HOMEPAGE=http://homepage3.nifty.com/tsato/xvkbd/
+HOMEPAGE=http://t-sato.in.coocan.jp/xvkbd/
 KEYWORDS=amd64 ~arm ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt x11-libs/libXtst
 SLOT=0
-SRC_URI=http://homepage3.nifty.com/tsato/xvkbd/xvkbd-3.7.tar.gz
+SRC_URI=http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.7.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=48decf3e4ef2b89bb46c175f2a51a254
+_md5_=09fb25f2da9fff8988b588e8c11e2a2c
diff --git a/metadata/md5-cache/x11-misc/xvkbd-3.8 b/metadata/md5-cache/x11-misc/xvkbd-3.8
new file mode 100644
index 000000000000..2b5d37f485e8
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xvkbd-3.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install
+DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt x11-libs/libXtst app-text/rman x11-misc/gccmakedep x11-misc/imake x11-proto/inputproto x11-proto/xextproto x11-proto/xproto
+DESCRIPTION=virtual keyboard for X window system
+EAPI=6
+HOMEPAGE=http://t-sato.in.coocan.jp/xvkbd/
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt x11-libs/libXtst
+SLOT=0
+SRC_URI=http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.8.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=a73c44dac5c5a6be47b572b5ffd4b877
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 478c39b09099..10ab13fa6c53 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/xfce4-terminal-0.8.6 b/metadata/md5-cache/x11-terms/xfce4-terminal-0.8.6
index bfd8ff10db64..a5cd777efd0d 100644
--- a/metadata/md5-cache/x11-terms/xfce4-terminal-0.8.6
+++ b/metadata/md5-cache/x11-terms/xfce4-terminal-0.8.6
@@ -3,9 +3,9 @@ DEPEND=>=dev-libs/glib-2.32:2= >=x11-libs/gtk+-3.16:3= x11-libs/libX11:= >=x11-l
 DESCRIPTION=A terminal emulator for the Xfce desktop environment
 EAPI=6
 HOMEPAGE=https://docs.xfce.org/apps/terminal/start
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.32:2= >=x11-libs/gtk+-3.16:3= x11-libs/libX11:= >=x11-libs/vte-0.38:2.91= >=xfce-base/libxfce4ui-4.10:=[gtk3(+)]
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/xfce4-terminal/0.8/xfce4-terminal-0.8.6.tar.bz2
-_md5_=66655a050b1a589f72f03010397f57b7
+_md5_=4f0f3d0e0d3dcb8af0156dc59a5be92e
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 70b41b463c3c..1840ad6f19e7 100644
--- a/metadata/md5-cache/x11-themes/Manifest.gz
+++ b/metadata/md5-cache/x11-themes/Manifest.gz
diff --git a/metadata/md5-cache/x11-themes/xfwm4-themes-4.10.0-r1 b/metadata/md5-cache/x11-themes/xfwm4-themes-4.10.0-r1
index 936f963bf3f6..9a5cb3cb255d 100644
--- a/metadata/md5-cache/x11-themes/xfwm4-themes-4.10.0-r1
+++ b/metadata/md5-cache/x11-themes/xfwm4-themes-4.10.0-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=setup
 DESCRIPTION=Additional themes for the Xfce window manager
 EAPI=6
 HOMEPAGE=https://www.xfce.org/projects/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=>=xfce-base/xfwm4-4.10
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://xfce/src/art/xfwm4-themes/4.10/xfwm4-themes-4.10.0.tar.bz2
-_md5_=f3da46b2b177bc48dd2dcaea93fbb9df
+_md5_=47843db5daa8ad257c094e343c86a2b8
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index fb2336eec0dc..1cdb2ecad28e 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/windowmaker-0.95.7 b/metadata/md5-cache/x11-wm/windowmaker-0.95.7
index e41c99e7afe2..c49a5636acfb 100644
--- a/metadata/md5-cache/x11-wm/windowmaker-0.95.7
+++ b/metadata/md5-cache/x11-wm/windowmaker-0.95.7
@@ -10,4 +10,4 @@ RDEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/l
 SLOT=0
 SRC_URI=http://windowmaker.org/pub/source/release/WindowMaker-0.95.7.tar.gz http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1b775013946f0ef0e15a6d521e1cb3d5
+_md5_=85c43b36640687585ffce4d5c23dba67
diff --git a/metadata/md5-cache/x11-wm/windowmaker-0.95.8-r1 b/metadata/md5-cache/x11-wm/windowmaker-0.95.8-r1
index 76a85e6acb8e..f1db56a16950 100644
--- a/metadata/md5-cache/x11-wm/windowmaker-0.95.8-r1
+++ b/metadata/md5-cache/x11-wm/windowmaker-0.95.8-r1
@@ -10,4 +10,4 @@ RDEPEND=media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/l
 SLOT=0
 SRC_URI=http://windowmaker.org/pub/source/release/WindowMaker-0.95.8.tar.gz http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7082b82455864a89f91e4df5fb4cab50
+_md5_=a3f483934e2acd0c6b032887c0bd1696
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 8c2ae51fde37..279361b2418b 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/libxfce4ui-4.13.4 b/metadata/md5-cache/xfce-base/libxfce4ui-4.13.4
index 290875b71d09..591bdaad0da8 100644
--- a/metadata/md5-cache/xfce-base/libxfce4ui-4.13.4
+++ b/metadata/md5-cache/xfce-base/libxfce4ui-4.13.4
@@ -4,11 +4,11 @@ DESCRIPTION=Unified widget and session management libs for Xfce
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=debug glade introspection startup-notification vala
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.42:2= >=x11-libs/gtk+-2.24:2= >=x11-libs/gtk+-3.18:3=[introspection?] x11-libs/libX11:= x11-libs/libICE:= x11-libs/libSM:= >=xfce-base/libxfce4util-4.12:=[introspection?] >=xfce-base/xfconf-4.12:= glade? ( dev-util/glade:3.10= ) introspection? ( dev-libs/gobject-introspection:= ) startup-notification? ( x11-libs/startup-notification:= ) vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) ) !xfce-base/xfce-utils
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/libxfce4ui/4.13/libxfce4ui-4.13.4.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=878e497db5dd2f9ffddb8df0a4ba69ac
+_md5_=4da5d8c7bc34a300d77883aaf458d531
diff --git a/metadata/md5-cache/xfce-base/libxfce4util-4.13.1 b/metadata/md5-cache/xfce-base/libxfce4util-4.13.1
index 3e15017794af..d02a6a5c3386 100644
--- a/metadata/md5-cache/xfce-base/libxfce4util-4.13.1
+++ b/metadata/md5-cache/xfce-base/libxfce4util-4.13.1
@@ -4,9 +4,9 @@ DESCRIPTION=A basic utility library for the Xfce desktop environment
 EAPI=6
 HOMEPAGE=https://git.xfce.org/xfce/libxfce4util/
 IUSE=introspection
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.30:= introspection? ( dev-libs/gobject-introspection:= )
 SLOT=0/7
 SRC_URI=mirror://xfce/src/xfce/libxfce4util/4.13/libxfce4util-4.13.1.tar.bz2
-_md5_=75e5bf66cb074af8dc264a748bcf4751
+_md5_=d4985672b65676853b34c895be57d605
diff --git a/metadata/md5-cache/xfce-base/libxfcegui4-4.10.0-r2 b/metadata/md5-cache/xfce-base/libxfcegui4-4.10.0-r2
index 5e3564fc208f..9de58d8dd8b6 100644
--- a/metadata/md5-cache/xfce-base/libxfcegui4-4.10.0-r2
+++ b/metadata/md5-cache/xfce-base/libxfcegui4-4.10.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A compability library for unported Xfce 4.6 plugins (DEPRECATED)
 EAPI=6
 HOMEPAGE=https://git.xfce.org/archive/libxfcegui4/
 IUSE=startup-notification
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=gnome-base/libglade x11-libs/libSM x11-libs/libX11 >=x11-libs/gtk+-2.10:2 >=xfce-base/libxfce4util-4.10 startup-notification? ( x11-libs/startup-notification )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/libxfcegui4/4.10/libxfcegui4-4.10.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=72920ef5d7b06a99306115c7403ca798
+_md5_=4801bfa0ebdeb0e4245102182d4f0bbb
diff --git a/metadata/md5-cache/xfce-base/thunar-1.6.13 b/metadata/md5-cache/xfce-base/thunar-1.6.13
index 391309bde621..7961e4378169 100644
--- a/metadata/md5-cache/xfce-base/thunar-1.6.13
+++ b/metadata/md5-cache/xfce-base/thunar-1.6.13
@@ -4,11 +4,11 @@ DESCRIPTION=File manager for the Xfce desktop environment
 EAPI=6
 HOMEPAGE=https://www.xfce.org/projects/ https://docs.xfce.org/xfce/thunar/start
 IUSE=+dbus exif libnotify pcre test +trash-panel-plugin udisks test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-lang/perl-5.6 >=dev-libs/glib-2.30:= >=x11-libs/gdk-pixbuf-2.14:= >=x11-libs/gtk+-2.24:2= >=xfce-base/exo-0.10:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10.1:= >=xfce-base/xfconf-4.10:= dbus? ( >=dev-libs/dbus-glib-0.100:= ) exif? ( >=media-libs/libexif-0.6.19:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) pcre? ( >=dev-libs/libpcre-6:= ) trash-panel-plugin? ( >=xfce-base/xfce4-panel-4.10:= ) udisks? ( virtual/libgudev:= ) >=dev-util/desktop-file-utils-0.20-r1 x11-misc/shared-mime-info dbus? ( >=gnome-base/gvfs-1.18.3 ) trash-panel-plugin? ( >=gnome-base/gvfs-1.18.3 ) udisks? ( virtual/udev >=gnome-base/gvfs-1.18.3[udisks,udev] )
 REQUIRED_USE=trash-panel-plugin? ( dbus )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/thunar/1.6/Thunar-1.6.13.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=583d0bc57f556ec70d4fef37792a49d8
+_md5_=ca08ee562476fba318e9186c8764514d
diff --git a/metadata/md5-cache/xfce-base/xfce4-meta-4.12-r1 b/metadata/md5-cache/xfce-base/xfce4-meta-4.12-r1
index def6ef351c1e..992c674bd541 100644
--- a/metadata/md5-cache/xfce-base/xfce4-meta-4.12-r1
+++ b/metadata/md5-cache/xfce-base/xfce4-meta-4.12-r1
@@ -3,8 +3,8 @@ DESCRIPTION=The Xfce Desktop Environment (meta package)
 EAPI=6
 HOMEPAGE=https://www.xfce.org/
 IUSE=minimal +svg
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=metapackage
 RDEPEND=>=x11-themes/gtk-engines-xfce-3:0 x11-themes/hicolor-icon-theme >=xfce-base/xfce4-appfinder-4.12 >=xfce-base/xfce4-panel-4.12 >=xfce-base/xfce4-session-4.12 >=xfce-base/xfce4-settings-4.12 >=xfce-base/xfdesktop-4.12 >=xfce-base/xfwm4-4.12 !minimal? ( media-fonts/dejavu virtual/freedesktop-icon-theme ) svg? ( gnome-base/librsvg )
 SLOT=0
-_md5_=e6a71bb02efcaf23c3c80bbad9257daf
+_md5_=e954dd81384c63fdf31fb17ae1a50c40
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.12.2 b/metadata/md5-cache/xfce-base/xfce4-panel-4.12.2
index 1426f00945a8..6a3023722c96 100644
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.12.2
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.12.2
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.24:= >=x11-libs/cairo-1:=
 DESCRIPTION=Panel for the Xfce desktop environment
 EAPI=6
 HOMEPAGE=https://www.xfce.org/projects/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.24:= >=x11-libs/cairo-1:= >=x11-libs/gtk+-2.20:2= >=x11-libs/gtk+-3.2:3= x11-libs/libX11:= >=x11-libs/libwnck-2.31:1= >=xfce-base/exo-0.8:= >=xfce-base/garcon-0.3:=[gtk2(+)] >=xfce-base/libxfce4ui-4.11:= >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:=
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/xfce4-panel/4.12/xfce4-panel-4.12.2.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3e6102bfa2abea5004d30957134926c2
+_md5_=95cf4becf8aab05fb1892f015f69760e
diff --git a/metadata/md5-cache/xfce-base/xfconf-4.12.1 b/metadata/md5-cache/xfce-base/xfconf-4.12.1
index 2cad55145e5c..4e1a2cfbd958 100644
--- a/metadata/md5-cache/xfce-base/xfconf-4.12.1
+++ b/metadata/md5-cache/xfce-base/xfconf-4.12.1
@@ -4,10 +4,10 @@ DESCRIPTION=A configuration management system for Xfce
 EAPI=5
 HOMEPAGE=https://www.xfce.org/projects/
 IUSE=debug perl
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.30 >=xfce-base/libxfce4util-4.10 perl? ( dev-lang/perl:=[-build(-)] dev-perl/glib-perl )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/xfconf/4.12/xfconf-4.12.1.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25	xfconf	25bb7fe99d6e58851633dc43d429c5ae
-_md5_=7ae71ce6b2170325df0c63fb9fc3a5c5
+_md5_=f9f63d2e31d9a1353b8a21016d857a18
diff --git a/metadata/md5-cache/xfce-base/xfdesktop-4.12.4 b/metadata/md5-cache/xfce-base/xfdesktop-4.12.4
index 6f88c3bd45ff..63820d969033 100644
--- a/metadata/md5-cache/xfce-base/xfdesktop-4.12.4
+++ b/metadata/md5-cache/xfce-base/xfdesktop-4.12.4
@@ -4,10 +4,10 @@ DESCRIPTION=Desktop manager for the Xfce desktop environment
 EAPI=6
 HOMEPAGE=https://www.xfce.org/projects/
 IUSE=debug libnotify +thunar
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/cairo-1.6:= >=dev-libs/dbus-glib-0.100:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= >=x11-libs/libwnck-2.30:1= x11-libs/libX11:= >=xfce-base/exo-0.8:= >=xfce-base/garcon-0.3:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/libxfce4util-4.11:= >=xfce-base/xfconf-4.10:= libnotify? ( >=x11-libs/libnotify-0.7:= ) thunar? ( >=dev-libs/glib-2.38:= >=xfce-base/thunar-1.6:=[dbus] )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/xfdesktop/4.12/xfdesktop-4.12.4.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bdbe93482af863e0f6c5c84f70d1e3e8
+_md5_=a86114d77a8cd32ea114f722af77b750
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.12.4 b/metadata/md5-cache/xfce-base/xfwm4-4.12.4
index 6afec1fdd5dd..d88f76004eb5 100644
--- a/metadata/md5-cache/xfce-base/xfwm4-4.12.4
+++ b/metadata/md5-cache/xfce-base/xfwm4-4.12.4
@@ -4,9 +4,9 @@ DESCRIPTION=Window manager for the Xfce desktop environment
 EAPI=6
 HOMEPAGE=https://www.xfce.org/projects/
 IUSE=dri startup-notification +xcomposite
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-2.24:2= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-2.30:1= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.11:= >=xfce-base/xfconf-4.10:= startup-notification? ( x11-libs/startup-notification:= ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/xfwm4/4.12/xfwm4-4.12.4.tar.bz2
-_md5_=74983a82143c6241e461d0acb810e086
+_md5_=9e1a5e988a0e01dcaead12f2c5f55cf2
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 82a894eaa40c..bed1868cd3f7 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.1-r3 b/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.1-r3
index f64a3d4e717b..bf40fee69883 100644
--- a/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.1-r3
+++ b/metadata/md5-cache/xfce-extra/thunar-archive-plugin-0.3.1-r3
@@ -3,10 +3,10 @@ DEPEND=>=xfce-base/libxfce4util-4.8:= >=xfce-base/exo-0.6:= >=xfce-base/thunar-1
 DESCRIPTION=Archive plug-in for the Thunar filemanager
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=>=xfce-base/libxfce4util-4.8:= >=xfce-base/exo-0.6:= >=xfce-base/thunar-1.2:=
 SLOT=0
 SRC_URI=mirror://xfce/src/thunar-plugins/thunar-archive-plugin/0.3/thunar-archive-plugin-0.3.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eea1491d93b72a9557d9a370675ac0c8
+_md5_=2aa8a86aad62bec4fff1b75e27a71d03
diff --git a/metadata/md5-cache/xfce-extra/thunar-volman-0.8.1-r1 b/metadata/md5-cache/xfce-extra/thunar-volman-0.8.1-r1
index 232612b26e44..b9c55b11aa63 100644
--- a/metadata/md5-cache/xfce-extra/thunar-volman-0.8.1-r1
+++ b/metadata/md5-cache/xfce-extra/thunar-volman-0.8.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Daemon that enforces volume-related policies
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/thunar-plugins/thunar-volman
 IUSE=libnotify
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.30 virtual/libgudev:= >=x11-libs/gtk+-2.24:2 >=xfce-base/exo-0.10 >=xfce-base/libxfce4ui-4.10 >=xfce-base/libxfce4util-4.10 >=xfce-base/xfconf-4.10 libnotify? ( >=x11-libs/libnotify-0.7 ) virtual/udev >=xfce-base/thunar-1.6[udisks]
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/thunar-volman/0.8/thunar-volman-0.8.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=186169e24c4f13939a8db7c6bfa53a48
+_md5_=11a80acd1927d966b06c6665ea307206
diff --git a/metadata/md5-cache/xfce-extra/tumbler-0.2.0 b/metadata/md5-cache/xfce-extra/tumbler-0.2.0
index 6d2439c686b7..89b675332dab 100644
--- a/metadata/md5-cache/xfce-extra/tumbler-0.2.0
+++ b/metadata/md5-cache/xfce-extra/tumbler-0.2.0
@@ -4,9 +4,9 @@ DESCRIPTION=A thumbnail service for Thunar
 EAPI=6
 HOMEPAGE=https://docs.xfce.org/xfce/thunar/start
 IUSE=curl ffmpeg gstreamer jpeg odf pdf raw
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26:2= media-libs/freetype:2= media-libs/libpng:0= >=sys-apps/dbus-1.6:= >=x11-libs/gdk-pixbuf-2.14:2= curl? ( >=net-misc/curl-7.25:= ) ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0= ) odf? ( >=gnome-extra/libgsf-1.14.20:= ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] ) >=xfce-base/thunar-1.4 gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/tumbler/0.2/tumbler-0.2.0.tar.bz2
-_md5_=2ae0cbbc1c21b4f3099a68c3cf7ac129
+_md5_=4af6d1f6cbe8e4d15c3ab4377707777a
diff --git a/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.4.2 b/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.4.2
index 17902ec7d133..050c9d418f9c 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.4.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-clipman-plugin-1.4.2
@@ -4,10 +4,10 @@ DESCRIPTION=A clipboard manager plug-in for the Xfce panel
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin
 IUSE=qrcode
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.32:2= >=x11-libs/gtk+-3.14:3= dev-libs/libunique:1= x11-libs/libXtst:= >=xfce-base/exo-0.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:= qrcode? ( >=media-gfx/qrencode-3.3.0:= )
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-clipman-plugin/1.4/xfce4-clipman-plugin-1.4.2.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4d598b7a08f4cb317f7620666e1d5ef9
+_md5_=8c1c72e987087bb8f1bebd30d4cf6a97
diff --git a/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.7.0 b/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.7.0
index d2058e707028..797407344855 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.7.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-datetime-plugin-0.7.0
@@ -3,10 +3,10 @@ DEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= dev
 DESCRIPTION=A panel plug-in with date, time and embedded calender
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-datetime-plugin/0.7/xfce4-datetime-plugin-0.7.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ef721caa98d82cd6bb604fedd6e629e8
+_md5_=76c6f080e894a04e5c2c0c06f5980e45
diff --git a/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.0 b/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.0
index 23efee5bb9f4..7d6778bf5d59 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-dict-0.8.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.24:= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:= >=xfce-b
 DESCRIPTION=A dict.org querying application and panel plug-in for the Xfce desktop
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-dict
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.24:= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfce4-panel-4.10:=
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/xfce4-dict/0.8/xfce4-dict-0.8.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1d25d958966f5581435607884e92755e
+_md5_=7c4c12987683129c86c8f17fd2bd5987
diff --git a/metadata/md5-cache/xfce-extra/xfce4-genmon-plugin-4.0.1 b/metadata/md5-cache/xfce-extra/xfce4-genmon-plugin-4.0.1
index 905db3630848..31599ff1ac5b 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-genmon-plugin-4.0.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-genmon-plugin-4.0.1
@@ -3,9 +3,9 @@ DEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= dev
 DESCRIPTION=Cyclically spawned executable output on the panel
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-genmon-plugin/4.0/xfce4-genmon-plugin-4.0.1.tar.bz2
-_md5_=f547fbd47f0bfe107b4495fc8ff239ab
+_md5_=33a71cad207b959d8babaee9a630083d
diff --git a/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-1.1.2 b/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-1.1.2
index 006300d3fb31..0c555f48f198 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-1.1.2
+++ b/metadata/md5-cache/xfce-extra/xfce4-mount-plugin-1.1.2
@@ -3,9 +3,9 @@ DEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= dev
 DESCRIPTION=An mount plug-in for the Xfce panel
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:=
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-mount-plugin/1.1/xfce4-mount-plugin-1.1.2.tar.bz2
-_md5_=a6c7b7f7c007d212613c3e1c421eaa91
+_md5_=edcfbba5bf5373916c01ccde1b61c502
diff --git a/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.1 b/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.1
index 0b6876170218..a3157421a4ab 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=Power manager for the Xfce desktop environment
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-power-manager
 IUSE=debug kernel_linux networkmanager +panel-plugin policykit
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.42:= >=sys-power/upower-0.99.0 sys-power/pm-utils >=x11-libs/gtk+-3.14:3= >=x11-libs/libnotify-0.7:= x11-libs/libX11:= >=x11-libs/libXrandr-1.2:= x11-libs/libXext:= x11-libs/libXtst:= >=xfce-base/xfconf-4.12:= >=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/libxfce4util-4.12:= panel-plugin? ( >=xfce-base/xfce4-panel-4.12:= ) policykit? ( >=sys-auth/polkit-0.112 ) networkmanager? ( net-misc/networkmanager )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/xfce4-power-manager/1.6/xfce4-power-manager-1.6.1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a711ac7dfbee13b422980988a68290df
+_md5_=3c64675958c639eb1400fe5626b90710
diff --git a/metadata/md5-cache/xfce-extra/xfce4-smartbookmark-plugin-0.5.0 b/metadata/md5-cache/xfce-extra/xfce4-smartbookmark-plugin-0.5.0
index 248261736845..cd43f6ee84b8 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-smartbookmark-plugin-0.5.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-smartbookmark-plugin-0.5.0
@@ -3,9 +3,9 @@ DEPEND=>=xfce-base/libxfce4ui-4.12:=[gtk3(+)] >=xfce-base/xfce4-panel-4.12:= dev
 DESCRIPTION=Smart bookmark plug-in for the Xfce desktop environment
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-smartbookmark-plugin/0.5/xfce4-smartbookmark-plugin-0.5.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7caa7756f2c22a2f4f7cd8b449027775
+_md5_=7b156dd9b6945287b280f0280f5bde91
diff --git a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.2.0 b/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.2.0
index 4b2a068d6c5c..c981b66c24a1 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.2.0
+++ b/metadata/md5-cache/xfce-extra/xfce4-taskmanager-1.2.0
@@ -4,9 +4,9 @@ DESCRIPTION=Easy to use task manager
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/applications/xfce4-taskmanager
 IUSE=gtk3
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=x11-libs/cairo:= x11-libs/libX11:= x11-libs/libXmu:= gtk3? ( x11-libs/gtk+:3= x11-libs/libwnck:3= ) !gtk3? ( >=x11-libs/gtk+-2.12:2= x11-libs/libwnck:1= )
 SLOT=0
 SRC_URI=mirror://xfce/src/apps/xfce4-taskmanager/1.2/xfce4-taskmanager-1.2.0.tar.bz2
-_md5_=caec7f468d68bea623a99c5b994a8373
+_md5_=ee6dab4e17080d5e21f39b10f417fbc8
diff --git a/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.1 b/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.1
index 9645b18054d9..d61e469baf61 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.1
+++ b/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.1
@@ -3,9 +3,9 @@ DEPEND=gnome-base/librsvg:= x11-libs/gtk+:3= x11-libs/libwnck:3= x11-libs/libX11
 DESCRIPTION=XKB layout switching panel plug-in for the Xfce desktop environment
 EAPI=6
 HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=BSD-2 GPL-2+
 RDEPEND=gnome-base/librsvg:= x11-libs/gtk+:3= x11-libs/libwnck:3= x11-libs/libX11:= >=x11-libs/libxklavier-5.4:= xfce-base/garcon:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.12.1:= x11-apps/setxkbmap >=xfce-base/xfce4-settings-4.11
 SLOT=0
 SRC_URI=mirror://xfce/src/panel-plugins/xfce4-xkb-plugin/0.8/xfce4-xkb-plugin-0.8.1.tar.bz2
-_md5_=3880036adaebed667c92af25e85a068c
+_md5_=87162da168a4e9d5981cb5d27611377b
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 3fdd7aa7cce8..5708e6e5d108 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 18681 BLAKE2B 4f85adba586bfd437a0328673a50f9ff929b291451a2e78ff32d7e1f6aeac36cbfce721d56e702e4af82ecaf36e51941bee4738c97c7436334b0e3e6e9ae2aab SHA512 cba0a30e14d7bfc769327a97e3bc72f859d18d8b00b3bdc01eaf9cbbd4082a156ae3b4a82bb820804f4255af798ad3bc668cd148a3a069fc90a374cb5f377fe0
-TIMESTAMP 2018-01-06T22:09:06Z
+TIMESTAMP 2018-01-07T17:39:12Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpRSQJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpSW0BfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klABABAAj8Th+lqgDR8xOsoeSraqxfbHlvdJlm7tdILtSGOi9Segu3h7wqvZxHr9
-j+H1VSLc7CdrgvwaGfDmHCIVZ5k9jMWEzb66WySVeOmwYVFpDnZASywBp9GMMyKU
-jrDwVzVaIo3EGQuhTTdNVHZfn4meTYbGtlPJL1sKy7QCPn9b+GG8khH2hI4AJm+k
-HtPTIkyABh8QXqFTXr7weIriR3Sk7NFPMl2UOwb2yYN+aBy3llQTN57cfJ9TY/1/
-BmTAvLwTXsRe7jdfJPSCH3vZypfg9fIrgaF4tmZnGWbQqH0PWRS9IZkmnE5eR+qh
-QV6iIN9D1scR1twKc8AviMRocm7sUuFmrDmmDOWyhbawc8j2onahUIMjgBV25uaf
-66avio7SlinWUha/GzmI088ejBHKvt4Pz3Lzc9G6levAzxdZrzgUNnEB/97/lP/0
-O/aVcx9IhZLJvVdpkyx7AMJ0G7yPgwaq6WU0IVUIZrWSDoE/Zilq+I8OwoaHJ50r
-9D7IWyyFAziRWkDK/ND1DTmvILMgarevYb3o9VRFRTcg4GdzBMCX4cuY0GsY1YLN
-6wwS3/gcf4etpkN0dMWcgrAjZBsyqilRRs8uinRyxrjClfuyGXXGvkZkW0t/FEQW
-eY1AWdHEHxRcuul38MUAlVyfn+dUX7uZEPOxBkfEIDlHZo3rkKM=
-=2Had
+klB+xQ/9H3/eDlbNfEeMvmCelrodAvCeIHc00sURuhvV9/6gY2N6b2ZtXQMSAiD+
+FwfzSVirjU2g2tzVBygCAWHfHfWXrCDL+6a6xIVlFyKox9BGsro+XdXMVKeObPZf
+cdDOFoLUrSgcDxX9poRA93DPoxPb6PMjcMvPfzgIKb+idk+ddDznNRsc6sz4Ffd2
+w7pjpHS6HSmwkrQLcBZ/oLwRmKSc5eOKTux+sllX9K2n7kTJMHFU8v3kf5auvfB9
+eWQZm4nHUae6TTxnHMmeFr0P5F75b1SDX46S8qLKI36QTcxhGSJirD8jdyMh0Jcb
+GGHVN0bjXiynIISt+2CT9WaTalNmLu95EjSGkKesLshfl1E7pDFEliY3De3bLa1c
+2wUSkg28WsDbmdvvvXRbdLr1dG/X5wgQJB69sVCmQgmnlaETmvA9GMopu3/x6KAZ
+jZGt2UQ84O53flYwEnI2GodAmWJx973bPrpVWiF0hq8kgeVIYerVd690HrNoiwIm
+/uYURPP9jTHllWPh7hyZseYk34AXrZwNzHkrQU2sMps4DGZ787VGM/RGvFcYa+Hc
+m2kntXmX0/YLH1cDxvgbrh+YYThNlueOieh6fdHm/KQKfP1balIYdLNwwIIH1V8X
+EXZ5e0oFeZfWJT3sDfY5Bh+wLnMPiCIuYUe3grmhK3TqnFbB35g=
+=jgzs
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 2f6ffc4a1ba3..a90a981eef22 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 06 Jan 2018 22:09:02 +0000
+Sun, 07 Jan 2018 17:39:09 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 3b188f721679..067b1d140c80 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Jan  6 22:09:02 UTC 2018
+Sun Jan  7 17:39:09 UTC 2018
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 070126f52e40..1f63157801d4 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 06 Jan 2018 22:15:01 +0000
+Sun, 07 Jan 2018 17:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 7045113ca1cf..6e86d3fe2454 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-b574ef9a251cd9b57bae28d0562c4fdddbc06ab4 1515275959 2018-01-06T21:59:19+00:00
+1492da72ae39fde8ae773351effe77e869deaf57 1515345941 2018-01-07T17:25:41+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3eb952adc1ba..994e2d80d87f 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1515276301 Sat 06 Jan 2018 10:05:01 PM UTC
+1515346501 Sun 07 Jan 2018 05:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 2f6ffc4a1ba3..a90a981eef22 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 06 Jan 2018 22:09:02 +0000
+Sun, 07 Jan 2018 17:39:09 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 3b021e287fcb..067f4c6b40e5 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest
index aeb6fc1c159f..c18f13ac9750 100644
--- a/net-analyzer/sslscan/Manifest
+++ b/net-analyzer/sslscan/Manifest
@@ -1,7 +1,10 @@
 DIST openssl-1.0.2k.tar.gz 5309236 BLAKE2B 97069b9c7aaab2381ae5be989caff6907cd44ab1831d84685c3421ad985889a2bbc3a462decdff9c4c158ace96975de2b9e49e4f1b9f306990c3dc0f03767dad SHA512 0d314b42352f4b1df2c40ca1094abc7e9ad684c5c35ea997efdd58204c70f22a1abcb17291820f0fff3769620a4e06906034203d31eb1a4d540df3e0db294016
 DIST sslscan-1.11.10-rbsec-openssl.tar.gz 5523414 BLAKE2B 4cadd45ac8c41983ca79ec994b3bc5cafbacd02ea4b0336eead2dc8e77f6c2c0a39e5c6c07c7e12f16e92a753e3ee352a60148ea0a402b5b57f24b39be184a2e SHA512 e0ab14cd20bf8251defb685ca1384564f5f3624a8168608bed476f8d77ae4fd9096eacc36c0f271fc281d2d9070d25fa9e56ebf993321e06d6954e40c28537a7
 DIST sslscan-1.11.10-rbsec.tar.gz 52108 BLAKE2B db78ae281149da451cc2f6f60d8379d50bc2707b18b605960783dc90c75e365ee849435dfe982f6b3f3e33d1f99855f1a147754a97db2b58a82e67342a593c35 SHA512 802be7ad5289fb56b2902c69e2c831b5d8cacc01d650353b29c839e0ce4ae03e55656fa5d481c213b5162fc71b2a82da19b0ea34f6d86c34278c275a2bb73a7a
+DIST sslscan-1.11.11-rbsec-openssl.tar.gz 5523256 BLAKE2B d8f5aa8bf748310fe1186ec9ab74ecc33425d6fa3db709d94516780d4efadbdd9cf6358798796704dfeb4032ec615298f3b67c8150e314f1e79a4d826c2589b7 SHA512 9bfdac0b6dcbb9e932ef41db9753f7298cf38ddc18731386968289114fd5ed10d81e95523d557b42b431377638d2f62fb710189e7d944ba89979fe5e3437fd3f
+DIST sslscan-1.11.11-rbsec.tar.gz 53432 BLAKE2B 08be7c5a4126e8dee85adb48bd5d55f5e7931820462a18fe904439edc8fc690d60379c53c436d4953f9fbbb94c4e47eebd3fd48867b00d5819ba651569c99b7b SHA512 9492f1460b45212f80a19364c284ef2a11ad0c343bb324447ec519685d52805104d95a7817fda4d43af98ce2be2edede889e6ae83eab37d75be0ab46dca29d72
 DIST sslscan-1.11.9-rbsec.tar.gz 52215 BLAKE2B 8f2a28beb0a0c08f469ba473821e73420e593bb7d627064df520bb3e49311b426ebf3d94d255b3902cdf4eca167c1f54092d923f637bfd8c00eac8a84108ae61 SHA512 ed2ca15c185a36c166bec640f1771114ce845c0a84a6490aeca8170b8623ad3c370515c25079bb1f29fce79e3b24186fd298d72cc101d9076e4d7984a1202938
 EBUILD sslscan-1.11.10.ebuild 1305 BLAKE2B e12871889c0eccd9e2c99b5f3c2ba0502e2aee251de3fc5d9d98c03eded7d2daeb85cd3373f67d5bc696f1db0b284857ae8a38d421ef9785b2b64253cd87bdb4 SHA512 92fdddcce54763eddd8beb0f2ea474a60f2000d9c896d5b7b073ec3cb2a1dacae12f5f118fd94f5a4e382c7ded6808ca91cbba04929279d1da418e82237be404
+EBUILD sslscan-1.11.11.ebuild 1163 BLAKE2B 7bccef3a83ed1a8c7d914dd0959beb92d4402f1c141df390bd209ad7c77eaf7e2346c6547305a7dbf471e0d091199b70e4fbc1583b1076a13ff6c4bb21225400 SHA512 d86e6c4ea2e1437b63956e37d26c3240e71386c2e0dce98edd8077bd8aafb1c7b1ca4d2b8c3cb87250d51af6fa24a86e13992679ebbdd07d3667fa7171cbe920
 EBUILD sslscan-1.11.9.ebuild 1110 BLAKE2B e1036f2fdfbb28cc53826e7b48e931ae6b35f4cd8c709ccaaf51e87b13432a24e3493a09bea49ca8d778952498a74858532aea43b5d52ddf630af2bd9d902b3e SHA512 bcc11d8cf25284ee634e36bd4d9bc5fee8a98154064b0a9cbc01f969a1a9933a4e864a64a7b744a26a2c1d661e9b3709ab6519cd72ba9fc4bfc9be14e7273ca5
 MISC metadata.xml 295 BLAKE2B 4aed9a7658ee65ef0630a49abe71b2ab860377365b040ea0e19dfd8069f05e64cdab2c93fdf95276ad4087c247a18c195d05c81d90226ab6e753950fafce846e SHA512 561d272316db60726db149ffd3f77a59ed4fd7d16dd96e8064e1994666812d5056180965ef93939904ae653e0aa2cbc04621f5700464d5115490d56c24354bb4
diff --git a/net-analyzer/sslscan/sslscan-1.11.11.ebuild b/net-analyzer/sslscan/sslscan-1.11.11.ebuild
new file mode 100644
index 000000000000..61ffbbe5632e
--- /dev/null
+++ b/net-analyzer/sslscan/sslscan-1.11.11.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Upstream now builds against the openssl 1.0.x fork by PeterMosmans
+MOSMANS_OPENSSL_COMMIT=c9ba19c8b7fd131137373dbd1fccd6a8bb0628be
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Fast SSL configuration scanner"
+HOMEPAGE="https://github.com/rbsec/sslscan"
+MY_FORK="rbsec"
+SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz
+	static? ( https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +static"
+
+DEPEND="libressl? ( dev-libs/libressl )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}-${MY_FORK}"
+
+src_prepare() {
+	if use static; then
+		ln -s ../openssl-${MOSMANS_OPENSSL_COMMIT} openssl || die
+		touch .openssl_is_fresh || die
+
+		sed -i -e '/openssl\/.git/,/fi/d' \
+			-e '/openssl test/d' Makefile || die
+
+	fi
+
+	default
+}
+
+src_compile() {
+	if use static; then
+		emake static
+	else
+		emake
+	fi
+}
+
+src_install() {
+	DESTDIR="${D}" emake install
+
+	dodoc Changelog README.md
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index e48430540c83..87635fb6a5c1 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index 57d9deae460f..6d7879328f39 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -7,9 +7,9 @@ AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8
 DIST dnsmasq-2.76.tar.xz 480796 BLAKE2B 09dd0e97bcd70fa2beecd80ed157692a217a8a5b71f5d9491c419bedc909b1dcee043c5aeaab333a44d1775785182658ac999c5d3c4f4bd48f1683122697e326 SHA512 8a930f3e7cdc0c291ce89bea8128a4b8438b9aa9e660a2ac037e0baa4c5c74f4482a8f83b0410066a759444b3c4e1cf62a9beb625e38509690227996de10e06a
 DIST dnsmasq-2.77.tar.xz 487244 BLAKE2B 4671dd47f87c4554b7d18413cff22cd5ed8338d2d97a8c2ecb57a92d0c7efa6a7fd9ff208b529f124cd8678e0d7f9328366a18039162647bed6076a05a882b1a SHA512 6ca98a71a8fdfd606e29c58b34dadfa63148c39f931570cca67a287e044d52c6ec2f8acbf5620ada3312e9db3a2fd63877188d829c070beaa730607e3309e768
 DIST dnsmasq-2.78.tar.xz 489172 BLAKE2B 996b59181c4b582b74c91be073e62f0756d2e4c67ee36ff825b6973699f60e44959bb0451bbb8623f277e5a8378cda987a300eee6ec9398ae99284b302da2747 SHA512 9b79b84e5a768d52f90f6335ccef2c404ecd7a13e78e49f4cd0755fffc6cf34d0dc96ad4c72cad1dab3c5743a8d0d789b3e9b6e625b03c5675bb898ca61a698b
-EBUILD dnsmasq-2.76-r1.ebuild 4434 BLAKE2B 5b46e8a3453248aaee2012a065dfde9e90085acd3ea9934fe7b25ac878a9925dd908818960ddcbd76cd3831d82b977b2f22c72652b6a348312ee981ee26fac8f SHA512 e6bdf4024337b4a58656e848c0e37ce7e866a452c88ecc4f8b98fa5cdaba6040d839c52654c1604270577dfe23e195ad20bfd0058b18500d591b80c5e14fdf48
-EBUILD dnsmasq-2.76.ebuild 4313 BLAKE2B e515fbdafbf418b15e660b791edaeb2e869326c71ed7a313e4ae9910c456db9285228e8d53de5056b941b6f977b2dfc9a372481153fbe5de3f83fc39a9e26a18 SHA512 dbe879468b566b1b12f069b7bae4a9abdab7cdd3677fb4aad0c514ab1b2510a5e17910527b107a137454e6008e0717731f7159a8e91736554ff456bb88c70206
-EBUILD dnsmasq-2.77-r1.ebuild 4586 BLAKE2B 3c63d3588bf1b63364e29c656ca70d558ea541f9de610c6fefbb5432a8d939839b6e5d9cf90145e87dbb13282b44275ec1a5f881a62239f80c98e78e9252afbd SHA512 f4510d0648c3827231b3eb77e8fb151ab6f770c59d15fbf72134509c7d6292af3d43149b81b00a5353a9d69e356abe401e29982f1e0eb141984c2095188eeca7
-EBUILD dnsmasq-2.77.ebuild 4554 BLAKE2B 37ba741c063b363813c698c8ecbcfe34ac98dbb50b1d6343a4a7cd88423356d4fa8231d2c4d82f9251afd4b2f3713487a41b9fd80c73f9201ea223090eee71b9 SHA512 0b470711d65db27c994309dd72c213127b1ae87e506fa0ada259152315a06724f2df786c14903bc6b63a50b01948106e68aebc93a5b81a1a3baab353fe37627a
-EBUILD dnsmasq-2.78.ebuild 4578 BLAKE2B be6a8982b552e7231c7ff6d34439e6195e1d41dd801056960d2ed692975c5007b638904ac265cbbc8f70703e9253fc0184e7b310c821c56e0325629a857c5117 SHA512 1e7d4223da18289c4c134cdc1a3dde5a69daa620e5c9c563f7e9491522abc0164611fcf9f4975386057286f6bed4e8fb8eeda21fa6e7411deb7f04a0ad5568b5
+EBUILD dnsmasq-2.76-r1.ebuild 4381 BLAKE2B 944decd725b60468fd5e24dfd03306e3c02caa859e16213b820283532309e25110e764d55da800d8430309cbb776802384dca2c5abbebe356a7001210ffd16b3 SHA512 b5751ff008cf1e81c54f984e6f9fb69af8d1d6598af1efd22dfffe56ea9e257932a1cdc7abd920fd4fe106620aed15038ef255748f506e8d317ff8fcb510a338
+EBUILD dnsmasq-2.76.ebuild 4260 BLAKE2B 16b873db306175a8e222b97d2d5692fea52143d88a12e977f9f13a83d6e932c6d2bd8846aa380b5fbe75bbcd9f81f09ac8895233f576c1484863d2af2cac8f0d SHA512 8e87b85b3a49f51357110d35f27d71b3f8a803f702d54e7cc21e45f430a674c2100de632a8a01a2b2cf27391955ee7ac0ab39dd61a1efaff9482cc2a7527f59f
+EBUILD dnsmasq-2.77-r1.ebuild 4527 BLAKE2B 427026b251afc91a374c6ebc836ec28e0889a3bd9aa913f1ce56885689b90000a7a66482cd1b859825b0233958ab5fecd0e464809e435e202d56f1db7f7ad447 SHA512 2a016687619f37c460737a2623d364d0a302ae7e3c062e6d6bc75c7ed130daeb4f8f02edf48c5c4cb626b8621c0404fde3c6ff2781c6fe9af88a6d49fa1e8b52
+EBUILD dnsmasq-2.77.ebuild 4495 BLAKE2B a767a8432ceb5232d70a368012d95729f7b154b98d86004ad1a0114ec8736fd0cdaac85fd52183ea9ef6df8d20c72d96976b0caf56dbd331a31ef9e9e5914169 SHA512 8bc8a3c2a222cb1715afbcb0d6ec38c8d61b2ff31c42351a39a4e0420605f1c7202850dde125cfaf47ccbd96d89440cb4afa99f6c60345ca1d67e77e358aa614
+EBUILD dnsmasq-2.78.ebuild 4519 BLAKE2B 5a77fab9bc9a9fa34bf725bbbf0ce3f762f092a203c43bdf24d86a01b98524dcbf97810cfb040d2f39c6651b670bc2114efe207e352a1b3f2177d07f69ed1a64 SHA512 e2b43fdf906f99765ef1503a724d31df154cb8d87e12aa17bb56b79e31e71874a0f0ee41ac1943b88f14d03dddd538f5c614b57afed73abf0c42fd788ba7b154
 MISC metadata.xml 1149 BLAKE2B 9d9b9c87dd5bf6233d4656e0de77cd9e5d75ef631731c2e9d06917ade555422a5d4dbd846bc6bc7b5ff411a7d706f35ba68bb8d5ec8f793d878bba2de86a1b44 SHA512 7fad0bb400a664a67e82173015dcc2fc95644dd6c357e787b8257a193dc14adbee8f5a04cb4422fadefdeec0d3dc5bd986f4f5b44ee420b8a104cb5a8e1b58a6
diff --git a/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild
index 27f157cd660e..95de5790dac2 100644
--- a/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,9 +14,6 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn +inotify ipv6 lua nls script selinux static tftp"
 DM_LINGUAS="de es fi fr id it no pl pt_BR ro"
-for dm_lingua in ${DM_LINGUAS}; do
-	IUSE+=" linguas_${dm_lingua}"
-done
 
 CDEPEND="dbus? ( sys-apps/dbus )
 	idn? ( net-dns/libidn )
@@ -141,7 +138,8 @@ src_install() {
 		install$(use nls && echo "-i18n")
 
 	for lingua in ${DM_LINGUAS}; do
-		use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua}
+		has ${lingua} ${LINGUAS-${lingua}} \
+			|| rm -rf "${D}"/usr/share/locale/${lingua}
 	done
 	[[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
 
diff --git a/net-dns/dnsmasq/dnsmasq-2.76.ebuild b/net-dns/dnsmasq/dnsmasq-2.76.ebuild
index 3b3d54b64eb9..77842fc8f919 100644
--- a/net-dns/dnsmasq/dnsmasq-2.76.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.76.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,9 +14,6 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn +inotify ipv6 lua nls script selinux static tftp"
 DM_LINGUAS="de es fi fr id it no pl pt_BR ro"
-for dm_lingua in ${DM_LINGUAS}; do
-	IUSE+=" linguas_${dm_lingua}"
-done
 
 CDEPEND="dbus? ( sys-apps/dbus )
 	idn? ( net-dns/libidn )
@@ -141,7 +138,8 @@ src_install() {
 		install$(use nls && echo "-i18n")
 
 	for lingua in ${DM_LINGUAS}; do
-		use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua}
+		has ${lingua} ${LINGUAS-${lingua}} \
+			|| rm -rf "${D}"/usr/share/locale/${lingua}
 	done
 	[[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
 
diff --git a/net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild
index 754968a7d317..17fb4b4ab3a6 100644
--- a/net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,10 +18,6 @@ IUSE+=" ipv6 lua nls script selinux static tftp"
 
 DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
 
-for dm_lingua in "${DM_LINGUAS[@]}"; do
-	IUSE+=" linguas_${dm_lingua}"
-done
-
 CDEPEND="dbus? ( sys-apps/dbus )
 	idn? (
 		!libidn2? ( net-dns/libidn )
@@ -147,7 +143,8 @@ src_install() {
 		install$(use nls && echo "-i18n")
 
 	for lingua in "${DM_LINGUAS[@]}"; do
-		use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua}
+		has ${lingua} ${LINGUAS-${lingua}} \
+			|| rm -rf "${D}"/usr/share/locale/${lingua}
 	done
 	[[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
 
diff --git a/net-dns/dnsmasq/dnsmasq-2.77.ebuild b/net-dns/dnsmasq/dnsmasq-2.77.ebuild
index 3b26668c2df5..3c45c1db5b18 100644
--- a/net-dns/dnsmasq/dnsmasq-2.77.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.77.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,10 +18,6 @@ IUSE+=" ipv6 lua nls script selinux static tftp"
 
 DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
 
-for dm_lingua in "${DM_LINGUAS[@]}"; do
-	IUSE+=" linguas_${dm_lingua}"
-done
-
 CDEPEND="dbus? ( sys-apps/dbus )
 	idn? ( net-dns/libidn )
 	libidn2? ( >=net-dns/libidn2-2.0 )
@@ -145,7 +141,8 @@ src_install() {
 		install$(use nls && echo "-i18n")
 
 	for lingua in "${DM_LINGUAS[@]}"; do
-		use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua}
+		has ${lingua} ${LINGUAS-${lingua}} \
+			|| rm -rf "${D}"/usr/share/locale/${lingua}
 	done
 	[[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
 
diff --git a/net-dns/dnsmasq/dnsmasq-2.78.ebuild b/net-dns/dnsmasq/dnsmasq-2.78.ebuild
index f01b5ac6f7b2..ee66cd35d3b7 100644
--- a/net-dns/dnsmasq/dnsmasq-2.78.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.78.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,10 +18,6 @@ IUSE+=" ipv6 lua nls script selinux static tftp"
 
 DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
 
-for dm_lingua in "${DM_LINGUAS[@]}"; do
-	IUSE+=" linguas_${dm_lingua}"
-done
-
 CDEPEND="dbus? ( sys-apps/dbus )
 	idn? (
 		!libidn2? ( net-dns/libidn )
@@ -147,7 +143,8 @@ src_install() {
 		install$(use nls && echo "-i18n")
 
 	for lingua in "${DM_LINGUAS[@]}"; do
-		use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua}
+		has ${lingua} ${LINGUAS-${lingua}} \
+			|| rm -rf "${D}"/usr/share/locale/${lingua}
 	done
 	[[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
 
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index d6af612ae26a..0d44f6770378 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/oneclickftp/Manifest b/net-ftp/oneclickftp/Manifest
deleted file mode 100644
index 9f56bfff3706..000000000000
--- a/net-ftp/oneclickftp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX oneclickftp-0.5.1-qt47.patch 679 BLAKE2B 0ad643c902399d342a2bb0eded744c665e647bcf313f541060c02dbe778d90e3f054ba8e908e93338253994748e163ef3ef07a821b2bb29498049ca44a127884 SHA512 238f0ccac1149f3324dac6c3c48e6616da4a8ba60e940a71eda997dea087b07e32cf239dd999c2fef3e3840a085665d4256b94b31a4616946bf80679a2d75a45
-DIST oneclickftp-0.5.1.tar.gz 109759 BLAKE2B b91386373f30afe608520fddb91c70a9c948833d71865bfeef7f77f1ffc8784d2e448c2be13d33bf0cfa5b269edba35bc8160671952c5af5a4a887711c9250a8 SHA512 69314faf29b7732b3a69958006e652cac97468cccff3ea3c8646f5633bfcf728d38ab412c6ab3c7b8451f314cc5e3078422eb65b41c207750ae88fc1d38d4b03
-EBUILD oneclickftp-0.5.1.ebuild 641 BLAKE2B 2a941848fd46530f42e3082f712d21ce502d7bec226867eb5f4fb201ca45f5f1a50ea290cf06d96a567b4b164828f71c1d8fa6d93604629560d13feabcf8b78e SHA512 3579bb259d26ee9fb44d02b83d38a06743ec377a10202d4ed5cb3db59dbe4c74547e0814f9266b6ea8c76870b4e6d10345974629e4af4d2f123a03c059f66e0a
-MISC metadata.xml 338 BLAKE2B de225322f0eb7a981f7d94d0ff01eddb91a8c12b5a22f8f31dd27e7df6ea76b236612e31b1931133307ea6caee53a5466ee099ab52f5894f10003302ad82a278 SHA512 ac653b110f7197c0db29aa196c63530131fc31f4070493f82716a5025e1b9e8033bcbfdc17d036c5e4c9ad3b1a73304938a7ec9ed8c19c94d7d2caab2cb62cb8
diff --git a/net-ftp/oneclickftp/files/oneclickftp-0.5.1-qt47.patch b/net-ftp/oneclickftp/files/oneclickftp-0.5.1-qt47.patch
deleted file mode 100644
index bea8e32af477..000000000000
--- a/net-ftp/oneclickftp/files/oneclickftp-0.5.1-qt47.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: oneclickftp-0.5.1/src/ftpwindowimpl.h
-===================================================================
---- oneclickftp-0.5.1.orig/src/ftpwindowimpl.h
-+++ oneclickftp-0.5.1/src/ftpwindowimpl.h
-@@ -38,7 +38,7 @@ class FTPWindowImpl : public QWidget, pu
- {
- Q_OBJECT
- public:
--	FTPWindowImpl(QString Dir, QString Profile, QString ProxyIP = 0, QString ProxyPort = 0);
-+	FTPWindowImpl(QString Dir, QString Profile, QString ProxyIP = QString::number(0), QString ProxyPort = QString::number(0));
- 	bool Upload(OProfile *ProfiletoUpload, std::vector<OFileConnection*> SelectedFiles);
- 	bool Download(OProfile *ProfiletoDownload, std::vector<OFileConnection*> SelectedFiles);
- 
diff --git a/net-ftp/oneclickftp/metadata.xml b/net-ftp/oneclickftp/metadata.xml
deleted file mode 100644
index a7a22d8c9a5f..000000000000
--- a/net-ftp/oneclickftp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>qt@gentoo.org</email>
-    <name>Gentoo Qt Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">oneclickftp</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-ftp/oneclickftp/oneclickftp-0.5.1.ebuild b/net-ftp/oneclickftp/oneclickftp-0.5.1.ebuild
deleted file mode 100644
index bd44189dc92f..000000000000
--- a/net-ftp/oneclickftp/oneclickftp-0.5.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils
-
-DESCRIPTION="The somehow different FTP client"
-HOMEPAGE="http://oneclickftp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	app-crypt/qca:2[qt4(+)]
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-qt47.patch"
-)
-
-src_configure() {
-	eqmake4
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	doicon res/icons/${PN}.png
-	make_desktop_entry ${PN} ${PN}
-
-	einstalldocs
-}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index a085823429b1..ab622ede17eb 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/mcabber/Manifest b/net-im/mcabber/Manifest
index bc8ee5752213..4e1a8eaceab2 100644
--- a/net-im/mcabber/Manifest
+++ b/net-im/mcabber/Manifest
@@ -1,6 +1,6 @@
 DIST mcabber-1.0.5.tar.bz2 605483 BLAKE2B 557ec5f4db6d2dab41fdb3110a165867d354f98f11c3d4ded34abe6b8fed5a895dd0e948bad94ca1694f61f398535f4d7701ddfd9d77a79c89cc9e0b54f587d0 SHA512 81b67899245902f495af7b44a5a0d710db69da731a00fb9ed84bdc0f88d5dc662f340817b1eaa843802c95105846234743eba52117f18bf12dd37a0da61d414d
 DIST mcabber-1.1.0.tar.bz2 608975 BLAKE2B 856b1a4d7118337f40b11348274c79d125776d5dddcd50f87097e58240807a4ecafc4816c44d44a51bf9cbb920edb225b312c1d5d0d52be4be93810512ef2706 SHA512 d12546e9fe9da94b6107f4d38d4083bee74e2702f7f2225e26be291230c6fe1319f60a3204da669dc00b14d69822425bf8214ebb723c3c4a7a33b1247a03093f
-EBUILD mcabber-1.0.5.ebuild 3272 BLAKE2B 4aef7ba2dcfb6e8ade2fe61e31137018947abebba0b3213d99ac1bb51f481b3b0318eb1f411bd7a498e7f15eeca4b431cc1a38168bf58550978abb4a66993775 SHA512 5f8822af3726417856a26c5a8df2b54b3a0ac7da734e211ac7d97458210a7003d7d2c6b0d09613df5967799af10d23c98bea562554bbcae5971cee1f51f6b632
-EBUILD mcabber-1.1.0.ebuild 3274 BLAKE2B 75cb3d148e90c09d9a80a181708df788238e6633b8a8231c7e51ef0b3b1d3b4d2fbecc90047ef4338a6692acf23a228422bfb00bf4c845d2561950aa3dd62358 SHA512 26410995e3772cfb8e6399a84e80c5214a82c9e8cd4d5bca050cff0d4d984487da2e3b940d32dd42f8274b23934ea7a83b4fac224914e8818cfd5a520ca982c9
-EBUILD mcabber-9999.ebuild 3127 BLAKE2B d931dcf1cee979abd0f284f6ae65e53226b889326885b7e33bd0c56cdd155d031ad418a015bb2a98cd367786e7a74b5e06fbd94d592437f7f23001b5284b4c83 SHA512 52112e47622c116c66e872bff8bced98d85be2b1bd672d569acb04535fdd38560ec30cb96b078bc62a9f540cd8ab3d2ce2bc883d929aedbde56bb3615dad6ac6
+EBUILD mcabber-1.0.5.ebuild 3263 BLAKE2B 652351eaead6cbd1958f4049519dd852b3739b1c230d92c21460b0f5866db417e34617e4ea7951d332d557ec2bdb44ca26914894f46443112b7d615c0373c8cb SHA512 4af3e20666454da1f028bf633c5aac3e159cfbb7941d44a943d9cbdba6dbb4e480ca6c6fe69e24fffcc221c61adb7bc36ba72ade9b24f91be15b2dc702c5dbaf
+EBUILD mcabber-1.1.0.ebuild 3265 BLAKE2B 7f4d13840b927fe76f190386ff463110ae3314de246cc6975a965c05a771c82fc64be2f7f65d550476f65c1ff1fd79477503228dd7fc83b77d8355d29f74304b SHA512 b4f17decd678b66c4ea2452f64617468ab9a138f639039216ee1e307ea3abdfd9799c6f8e5186eca25a88c41dd0864c39a3999d27c2b425dae2592c2678ff7bd
+EBUILD mcabber-9999.ebuild 3118 BLAKE2B fd135ef7d93099013fd4c214ae8d694d26a579b7595f543b9ef7c57af79984306d66550ef325c83e4eafb45282ed283fcee1b3ac1c8553712e9642781a75e1b3 SHA512 d1649a4b2ec89ecf62659522bd78827303279245d0d5b77f78827421a19696db4e772245c72c4657980fd5547e5fe301b0e9294bb3ce3c233758f9d56b4570d7
 MISC metadata.xml 737 BLAKE2B ee31c6374b29108389c26e62dfdb810f56a7efb3ca1c03f3e97c52361aacfdf1ce76429b1d83751d8d39d3acefa7e80b366d378317bff5e007ec8955498d8047 SHA512 c9315017cf969fc0b5b9dccb3fe52e9e563643d85334f5721e729f6e936d3e8bc0024ff292d9e66f3f629755a8d9f5ae39f3a160e2908762977663d94a049c3f
diff --git a/net-im/mcabber/mcabber-1.0.5.ebuild b/net-im/mcabber/mcabber-1.0.5.ebuild
index f7eb3aa298a3..b91ae75262f0 100644
--- a/net-im/mcabber/mcabber-1.0.5.ebuild
+++ b/net-im/mcabber/mcabber-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,9 +20,9 @@ KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 IUSE="aspell crypt idn modules otr spell ssl vim-syntax"
 
 LANGS="cs de fr it nl pl ru uk"
-# localized help versions are installed only, when LINGUAS var is set
+# localized help versions are installed only, when L10N var is set
 for i in ${LANGS}; do
-	IUSE="${IUSE} linguas_${i}"
+	IUSE="${IUSE} l10n_${i}"
 done;
 
 RDEPEND="crypt? ( >=app-crypt/gpgme-1.0.0 )
@@ -65,7 +65,7 @@ src_install() {
 
 	# clean unneeded language documentation
 	for i in ${LANGS}; do
-		use linguas_${i} || rm -rf "${ED}"/usr/share/${PN}/help/${i}
+		use l10n_${i} || rm -rf "${ED}"/usr/share/${PN}/help/${i}
 	done
 
 	# contrib themes
diff --git a/net-im/mcabber/mcabber-1.1.0.ebuild b/net-im/mcabber/mcabber-1.1.0.ebuild
index b3b5e4471f5d..3ae33728009b 100644
--- a/net-im/mcabber/mcabber-1.1.0.ebuild
+++ b/net-im/mcabber/mcabber-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,9 +20,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-lin
 IUSE="aspell crypt idn modules otr spell ssl vim-syntax"
 
 LANGS="cs de fr it nl pl ru uk"
-# localized help versions are installed only, when LINGUAS var is set
+# localized help versions are installed only, when L10N var is set
 for i in ${LANGS}; do
-	IUSE="${IUSE} linguas_${i}"
+	IUSE="${IUSE} l10n_${i}"
 done;
 
 RDEPEND="crypt? ( >=app-crypt/gpgme-1.0.0 )
@@ -65,7 +65,7 @@ src_install() {
 
 	# clean unneeded language documentation
 	for i in ${LANGS}; do
-		use linguas_${i} || rm -rf "${ED}"/usr/share/${PN}/help/${i}
+		use l10n_${i} || rm -rf "${ED}"/usr/share/${PN}/help/${i}
 	done
 
 	# contrib themes
diff --git a/net-im/mcabber/mcabber-9999.ebuild b/net-im/mcabber/mcabber-9999.ebuild
index 647f3fe81bbe..f008dcf76c74 100644
--- a/net-im/mcabber/mcabber-9999.ebuild
+++ b/net-im/mcabber/mcabber-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,9 +19,9 @@ KEYWORDS=""
 IUSE="aspell crypt idn modules otr spell ssl vim-syntax"
 
 LANGS="cs de fr it nl pl ru uk"
-# localized help versions are installed only, when LINGUAS var is set
+# localized help versions are installed only, when L10N var is set
 for i in ${LANGS}; do
-	IUSE="${IUSE} linguas_${i}"
+	IUSE="${IUSE} l10n_${i}"
 done;
 
 RDEPEND="crypt? ( >=app-crypt/gpgme-1.0.0 )
@@ -64,7 +64,7 @@ src_install() {
 
 	# clean unneeded language documentation
 	for i in ${LANGS}; do
-		use linguas_${i} || rm -rf "${ED}"/usr/share/${PN}/help/${i}
+		use l10n_${i} || rm -rf "${ED}"/usr/share/${PN}/help/${i}
 	done
 
 	# contrib themes
diff --git a/net-im/pork/Manifest b/net-im/pork/Manifest
deleted file mode 100644
index 03d2549c6b51..000000000000
--- a/net-im/pork/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pork-0.99.8.1-fix-buildsystem.patch 2980 BLAKE2B 568ca520f3815f2c72595dd2d2b1a287a6b39362d280c5bd6cdf8787799fa002f441cc6102ba26da2ea931898c45a00fd6d1ea4292b050a04734dd36e03859ec SHA512 410a519a56988746746de788128c09daff66f7ef68babd625c68585cd31955dd3ba7d003227417c675be0e27a7b78724b57585d29c4d3733c0cbc995258a6d44
-DIST pork-0.99.8.1.tar.gz 490425 BLAKE2B bf7576f83d35ad305894f5cd3f76687a737bb38011fcb3e007dbda51f59b1c618bdbdb2f358d1f859c0d06d658d131ce0cd625ad93bfea7c7c22c4710485aa57 SHA512 20efae37c847e4f4552280832c252341f3d541a08f94df21b780d130bb9dc61cf3464f99e119c01a540572a96340d84ed04e81458c0908357693b6af50d6e77f
-EBUILD pork-0.99.8.1-r1.ebuild 799 BLAKE2B 9dc5707c908ab3064ed640dae71a6f0e7b09271d063f0555a5cec4f2cb2fed0e2fd36f9d685bffb793980e457bad31c9fc3278dd8a0645210cbb6e0b9b1e5372 SHA512 24ed68afc98274261c426929b5be43c1cf9d1061a9ed0106a4d325f4fb3be9c2c396c5693ec30ed9bcd1e284cd636d8f570102c8e1dde8e24c55af9db3854526
-MISC metadata.xml 366 BLAKE2B 34329633dfe4b043c6ccde273e84ca7c4b43c67d51cdc1c342ed232199b822c1b389dd537038d75a0fa5dc3dc79ca9b3407f3363df7ae57d563271db9b176afe SHA512 3cb6bdcf1b0f87c99e7579bf694a95bc4b5128efbb797be26f13e5a53871fee6d20f6e1cd56266a0c877c58bc04cc6e95fc4f6098f0f96763d6cbc976d9ae07c
diff --git a/net-im/pork/files/pork-0.99.8.1-fix-buildsystem.patch b/net-im/pork/files/pork-0.99.8.1-fix-buildsystem.patch
deleted file mode 100644
index cb63980ee70e..000000000000
--- a/net-im/pork/files/pork-0.99.8.1-fix-buildsystem.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Fix buildsystem to explicitly compile with -std=gnu89 to avoid
-differencs in inline semantics introduced in GCC5.
-https://bugs.gentoo.org/show_bug.cgi?id=570598
-
-Additionally, fix QA issues caused by implicit declarations, such as:
-* QA Notice: Package triggers severe warnings which indicate that it
-*            may exhibit random runtime failures.
-* pork_inet.c:69:8: warning: implicit declaration of function ‘vasprintf’ [-Wimplicit-function-declaration]
-
---- pork-0.99.8.1/configure.ac
-+++ pork-0.99.8.1/configure.ac
-@@ -114,6 +114,8 @@
- 
- AC_CHECK_LIB(ncurses, resizeterm, AC_DEFINE(HAVE_RESIZETERM, 1, [Define to 1 if you have the 'resizeterm' function in -lncurses.]))
- 
-+AC_SEARCH_LIBS(stdscr, tinfo)
-+
- AC_CHECK_TYPE(u_int32_t, uint32_t)
- if test "$ac_cv_type_u_int32_t" = "no"; then
- 	AC_CHECK_TYPE(uint32_t, unsigned int)
---- pork-0.99.8.1/Makefile.am
-+++ pork-0.99.8.1/Makefile.am
-@@ -1,3 +1,5 @@
-+AM_CFLAGS = -std=gnu89
-+
- SUBDIRS = \
- 	src			\
- 	doc			\
---- pork-0.99.8.1/src/Makefile.am
-+++ pork-0.99.8.1/src/Makefile.am
-@@ -6,7 +6,7 @@
- endif
- 
- 
--AM_CFLAGS = -funsigned-char -Imissing -Wall -Iprotocols -fPIC
-+AM_CFLAGS = -funsigned-char -Imissing -Wall -Iprotocols -fPIC -std=gnu89
- AM_CFLAGS += -DHELP_PATH=\"$(pkgdatadir)/help\" -DSYSTEM_PORKRC=\"$(pkgdatadir)/porkrc\"
- AM_CFLAGS += $(PERL_CFLAGS) $(DEBUG_CFLAGS)
- 
---- pork-0.99.8.1/src/missing/Makefile.am
-+++ pork-0.99.8.1/src/missing/Makefile.am
-@@ -1,5 +1,5 @@
- INCLUDES = -I../../src
--AM_CFLAGS = $(DEBUG_CFLAGS) $(PERL_CFLAGS)
-+AM_CFLAGS = $(DEBUG_CFLAGS) $(PERL_CFLAGS) -std=gnu89
- 
- noinst_LIBRARIES = libmissing.a
- 
---- pork-0.99.8.1/src/pork_inet.c
-+++ pork-0.99.8.1/src/pork_inet.c
-@@ -9,8 +9,9 @@
- 
- #include <config.h>
- 
--#include <unistd.h>
-+#define _GNU_SOURCE 1
- #include <stdio.h>
-+#include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
- #include <errno.h>
---- pork-0.99.8.1/src/pork_screen_io.c
-+++ pork-0.99.8.1/src/pork_screen_io.c
-@@ -14,6 +14,8 @@
- 
- #include <config.h>
- 
-+#define _GNU_SOURCE 1
-+#include <stdio.h>
- #include <unistd.h>
- #include <ncurses.h>
- #include <stdlib.h>
---- pork-0.99.8.1/src/protocols/aim/Makefile.am
-+++ pork-0.99.8.1/src/protocols/aim/Makefile.am
-@@ -1,5 +1,5 @@
- INCLUDES = -I. -I.. -I../.. -I../../.. -I../../missing -Ilibfaim
--AM_CFLAGS = $(DEBUG_CFLAGS) $(PERL_CFLAGS)
-+AM_CFLAGS = $(DEBUG_CFLAGS) $(PERL_CFLAGS) -std=gnu89
- 
- noinst_LIBRARIES = libaim.a
- 
---- pork-0.99.8.1/src/protocols/irc/Makefile.am
-+++ pork-0.99.8.1/src/protocols/irc/Makefile.am
-@@ -1,6 +1,6 @@
- INCLUDES = -I. -I.. -I../.. -I../../.. -I../../missing
- 
--AM_CFLAGS = $(DEBUG_CFLAGS) $(PERL_CFLAGS)
-+AM_CFLAGS = $(DEBUG_CFLAGS) $(PERL_CFLAGS) -std=gnu89
- 
- noinst_LIBRARIES = libirc.a
- 
---- pork-0.99.8.1/src/protocols/Makefile.am
-+++ pork-0.99.8.1/src/protocols/Makefile.am
-@@ -3,6 +3,6 @@
- endif
- 
- INCLUDES = -I. -I.. -I../.. -I../missing
--AM_CFLAGS = $(DEBUG_CFLAGS) $(PERL_CFLAGS)
-+AM_CFLAGS = $(DEBUG_CFLAGS) $(PERL_CFLAGS) -std=gnu89
- 
- SUBDIRS = $(irc_dir) aim
diff --git a/net-im/pork/metadata.xml b/net-im/pork/metadata.xml
deleted file mode 100644
index 7ad6912389e9..000000000000
--- a/net-im/pork/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-	Pork is an AIM client based on the GAIM libraries with an interface similar to IRCII.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">ojnk</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-im/pork/pork-0.99.8.1-r1.ebuild b/net-im/pork/pork-0.99.8.1-r1.ebuild
deleted file mode 100644
index 5da6c71b7297..000000000000
--- a/net-im/pork/pork-0.99.8.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="Console based AIM client that looks like ircII"
-HOMEPAGE="http://dev.ojnk.net/"
-SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="perl"
-
-RDEPEND="
-	perl? ( dev-lang/perl )
-	sys-libs/ncurses:0=
-"
-DEPEND="${RDEPEND}"
-PATCHES=(
-	"${FILESDIR}/${P}-fix-buildsystem.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable perl)
-}
-
-src_install() {
-	default
-
-	doman doc/pork.1
-	insinto /usr/share/pork/examples
-	doins examples/blist.txt
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README STYLE TODO QUICK_START
-}
diff --git a/net-im/pyaim-t/Manifest b/net-im/pyaim-t/Manifest
deleted file mode 100644
index 009dff86b53b..000000000000
--- a/net-im/pyaim-t/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX pyaim-t-0.8-initd-r1 606 BLAKE2B 0e2fc8021b6972b64852460322ac3d2921a9d0369f2badec1f07a0ed4bb5fdcaa0c133a74052ae53456854c33a4a4f2ec21e486f96ce158cfdea6592cec92ddb SHA512 1bf3ac3c520631dd2899766ff847ccff71521bbe6a042b920a8dcd8d1b916b11ba0b7bce303c26fcf425b01d99952b1ddfffbcd6cb66c10a6ae4cda8f2816c00
-AUX pyaim-t-0.8.0.1-pillow-imaging.patch 1236 BLAKE2B 697b973bc1e4780a0c2eb45ec38a6c9aff1f9a845e7f9a9ec67cbb91e872f950bbe45a690cce288e44874d09d1f0cf06b7771ec4e36a821ee325a033738b1f86 SHA512 d013553eb5771b104e8b62eebe838199cbaa098f62265e27013296faf152c9a5a5f2dd2d972a3152518bd821c5c492ed615749444e76d72948e85554c83b84bd
-AUX pyaim-t-0.8.0.1-python26-warnings.patch 3678 BLAKE2B ab3d68532146ddbb0836c2052c66504d4695faa6b1efba28ee4488e818861f3c6c139e36af275dc5c91018778db2e7e25911f9e7a645b1a215316652842c33db SHA512 fdf3caf1edbefbec7a1eaa61e25ef2d014be86d17bbfbccd4e85eaea0e2f4d227426820de09573d443c3c9d9588c6b901578f8935c541615bc765b3dd7d73cc4
-DIST pyaim-t-0.8.0.1.tar.gz 143968 BLAKE2B c5693d0db48a1fff1031c1aef34bbee2c9822a1f5a239818dee4ff773443ac182d9bca5d7fbaa2f6439d2e9d54c8446d4fae9ad53bac2c027b282437507a81ab SHA512 70d92cb99f36452d95b32bda04ad5f4c74387ab4cc40ed3cd06da58285f4f4b5122aa470e34e4fb1dfedc13ef33feafb3ba6a7036caee9d95edb8969df730540
-EBUILD pyaim-t-0.8.0.1-r1.ebuild 1724 BLAKE2B ea16f78371f8c004b15bbf475a5e750e0a8241da1f20635ff9800c8254743b5d23abb55922492d0089699614443a2cb3b2b88c1fc9ea96479be58e6b7e8d7730 SHA512 2f17e19cc537cad89c186f0e97fec2233097f275f4358b4b0241ab91bf3da6ba37b323e3514d46af79116d042eef04e6f5b72b10b4eb3546db7ccf3aef3b9a1a
-MISC metadata.xml 467 BLAKE2B 1760e505e33b5500e0f7ea248fc7a2ada6588f6bdd0212c1d785f188e991bcb7cf108c61b348eaaf96ba83b590dba8e5ad3c65e2f6b8dddbb745608001178d8a SHA512 051ad4b8abe3dcca31a35901e5cfbc890dd85d957b1e8aeeeb07bfffc3b7aba78e567600a9053ae7cc6f09018e6fffd7805250cb1b4e932293b58051ad453fd1
diff --git a/net-im/pyaim-t/files/pyaim-t-0.8-initd-r1 b/net-im/pyaim-t/files/pyaim-t-0.8-initd-r1
deleted file mode 100644
index d823e193c5ae..000000000000
--- a/net-im/pyaim-t/files/pyaim-t-0.8-initd-r1
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-	use jabber-server
-}
-
-start() {
-	ebegin "Starting AIM Jabber Transport"
-	checkpath -q -d -m 0755 -o jabber:jabber /var/run/jabber/
-	start-stop-daemon --start --pidfile /var/run/jabber/pyaim-t.pid -u jabber -g jabber \
-		--exec INSPATH/pyaim-t.py -- \
-		-b -c /etc/jabber/pyaim-t.xml -l /var/log/jabber/pyaim-t.log
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping AIM Jabber Transport"
-	start-stop-daemon --stop --quiet --pidfile /var/run/jabber/pyaim-t.pid
-	eend $?
-}
diff --git a/net-im/pyaim-t/files/pyaim-t-0.8.0.1-pillow-imaging.patch b/net-im/pyaim-t/files/pyaim-t-0.8.0.1-pillow-imaging.patch
deleted file mode 100644
index 13067925c18a..000000000000
--- a/net-im/pyaim-t/files/pyaim-t-0.8.0.1-pillow-imaging.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur pyaimt-0.8.0.1/src/contact.py pyaimt-0.8.0.1-1/src/contact.py
---- pyaimt-0.8.0.1/src/contact.py	2009-08-24 15:04:03.000000000 +0200
-+++ pyaimt-0.8.0.1-1/src/contact.py	2013-09-18 17:57:12.863780595 +0200
-@@ -13,7 +13,7 @@
- import globals
- import base64
- if not config.disableAvatars:
--	import Image
-+	import PIL.Image as Image
- import StringIO
- 
- 
-diff -Naur pyaimt-0.8.0.1/src/imgmanip.py pyaimt-0.8.0.1-1/src/imgmanip.py
---- pyaimt-0.8.0.1/src/imgmanip.py	2009-08-24 15:04:03.000000000 +0200
-+++ pyaimt-0.8.0.1-1/src/imgmanip.py	2013-09-18 17:57:12.863780595 +0200
-@@ -5,7 +5,7 @@
- 
- if not config.disableAvatars:
- 	try:
--		import Image
-+		import PIL.Image as Image
- 		import StringIO
- 
- 		def convertToPNG(imageData):
-diff -Naur pyaimt-0.8.0.1/tools/infodump.py pyaimt-0.8.0.1-1/tools/infodump.py
---- pyaimt-0.8.0.1/tools/infodump.py	2009-08-24 15:04:03.000000000 +0200
-+++ pyaimt-0.8.0.1-1/tools/infodump.py	2013-09-18 17:57:12.864780582 +0200
-@@ -41,7 +41,7 @@
- 	print "Nevow Version: Unknown or Not Installed"
- 
- try:
--	from Image import VERSION
-+	from PIL.Image import VERSION
- 	print "Python Imaging Library (PIL) Version: " + VERSION
- except:
- 	print "Python Imaging Library (PIL) Version: Unknown or Not Installed"
diff --git a/net-im/pyaim-t/files/pyaim-t-0.8.0.1-python26-warnings.patch b/net-im/pyaim-t/files/pyaim-t-0.8.0.1-python26-warnings.patch
deleted file mode 100644
index a6fa52e757e8..000000000000
--- a/net-im/pyaim-t/files/pyaim-t-0.8.0.1-python26-warnings.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -Naur pyaimt-0.8.0.1/src/avatar.py pyaimt-0.8.0.1-py26//src/avatar.py
---- pyaimt-0.8.0.1/src/avatar.py	2009-08-24 15:04:03.000000000 +0200
-+++ pyaimt-0.8.0.1-py26//src/avatar.py	2011-08-24 20:30:06.146311346 +0200
-@@ -6,7 +6,7 @@
- from twisted.words.xish.domish import Element
- from debug import LogEvent, INFO, WARN, ERROR
- import lang
--import sha
-+from hashlib import sha1
- import base64
- import os
- import os.path
-@@ -46,7 +46,7 @@
- class Avatar:
- 	""" Represents an Avatar. Does not store the image in memory. """
- 	def __init__(self, imageData, avatarCache):
--		self.__imageHash = sha.sha(imageData).hexdigest()
-+		self.__imageHash = sha1(imageData).hexdigest()
- 		self.__avatarCache = avatarCache
- 
- 	def getImageHash(self):
-diff -Naur pyaimt-0.8.0.1/src/contact.py pyaimt-0.8.0.1-py26//src/contact.py
---- pyaimt-0.8.0.1/src/contact.py	2009-08-24 15:04:03.000000000 +0200
-+++ pyaimt-0.8.0.1-py26//src/contact.py	2011-08-24 20:30:06.146311346 +0200
-@@ -8,7 +8,6 @@
- import config
- from debug import LogEvent, INFO, WARN, ERROR
- import lang
--import sha
- import legacy
- import globals
- import base64
-diff -Naur pyaimt-0.8.0.1/src/legacy/aimt.py pyaimt-0.8.0.1-py26//src/legacy/aimt.py
---- pyaimt-0.8.0.1/src/legacy/aimt.py	2009-08-24 15:04:03.000000000 +0200
-+++ pyaimt-0.8.0.1-py26//src/legacy/aimt.py	2011-08-24 20:32:28.187361518 +0200
-@@ -11,7 +11,6 @@
- import re
- import time
- import binascii
--import md5
- import imgmanip
- 
- 
-diff -Naur pyaimt-0.8.0.1/src/legacy/buddies.py pyaimt-0.8.0.1-py26//src/legacy/buddies.py
---- pyaimt-0.8.0.1/src/legacy/buddies.py	2009-08-24 15:04:03.000000000 +0200
-+++ pyaimt-0.8.0.1-py26//src/legacy/buddies.py	2011-08-24 20:30:06.147311326 +0200
-@@ -12,7 +12,7 @@
- import os.path
- import binascii
- import os.path
--import md5
-+from hashlib import md5
- 
- X = os.path.sep
- 
-@@ -138,7 +138,7 @@
- 				avatarData = avatar.AvatarCache().setAvatar(imgmanip.convertToPNG(iconData))
- 				c.updateAvatar(avatarData, push=True)
- 				if not md5Hash:
--					m = md5.new()
-+					m = md5()
- 					m.update(iconData)
- 					md5Hash = m.digest()
- 				if not numHash:
-diff -Naur pyaimt-0.8.0.1/src/legacy/glue.py pyaimt-0.8.0.1-py26//src/legacy/glue.py
---- pyaimt-0.8.0.1/src/legacy/glue.py	2009-08-24 15:04:03.000000000 +0200
-+++ pyaimt-0.8.0.1-py26//src/legacy/glue.py	2011-08-24 20:31:20.066825898 +0200
-@@ -19,7 +19,7 @@
- import time
- import binascii
- import avatar
--import md5
-+from hashlib import md5
- 
- # The name of the transport
- name = "AIM Transport"
-@@ -450,7 +450,7 @@
- 			try:
- 				self.myavatar = imgmanip.convertToJPG(imageData)
- 				self.myavatarlen = len(self.myavatar)
--				m=md5.new()
-+				m=md5()
- 				m.update(self.myavatar)
- 				self.myavatarsum = m.digest()
- 				self.myavatarstamp = time.time()
-diff -Naur pyaimt-0.8.0.1/src/tlib/oscar.py pyaimt-0.8.0.1-py26//src/tlib/oscar.py
---- pyaimt-0.8.0.1/src/tlib/oscar.py	2009-08-24 15:04:03.000000000 +0200
-+++ pyaimt-0.8.0.1-py26//src/tlib/oscar.py	2011-08-24 20:30:22.415200813 +0200
-@@ -20,7 +20,7 @@
- from scheduler import Scheduler
- 
- import struct
--import md5
-+from hashlib import md5
- import string
- import socket
- import random
-@@ -106,9 +106,9 @@
-     return dict,data
- 
- def encryptPasswordMD5(password,key):
--    m=md5.new()
-+    m=md5()
-     m.update(key)
--    m.update(md5.new(password).digest())
-+    m.update(md5(password).digest())
-     m.update("AOL Instant Messenger (SM)")
-     return m.digest()
- 
-@@ -534,7 +534,7 @@
-         self.iconSum = tlvs.get(0xd5,"")
- 
-     def updateIcon(self, iconData):
--        m=md5.new()
-+        m=md5()
-         m.update(iconData)
-         self.iconSum = m.digest()
-         log.msg("icon sum is %s" % binascii.hexlify(self.iconSum))
diff --git a/net-im/pyaim-t/metadata.xml b/net-im/pyaim-t/metadata.xml
deleted file mode 100644
index 756ad481ebed..000000000000
--- a/net-im/pyaim-t/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-	<longdescription>Python based jabber transport for AIM</longdescription>
-	<use>
-		<flag name="webinterface">Install dependencies needed for the web
-		interface</flag>
-	</use>
-	<upstream>
-		<remote-id type="google-code">pyaimt</remote-id>
-		<remote-id type="launchpad">ubuntu</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild b/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild
deleted file mode 100644
index fb672c1c6789..000000000000
--- a/net-im/pyaim-t/pyaim-t-0.8.0.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-MY_PN="pyaimt"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python based jabber transport for AIM"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://debian/pool/main/p/${MY_PN}/${MY_PN}_${PV}.orig.tar.gz -> ${P}.tar.gz
-	https://launchpad.net/ubuntu/+archive/primary/+files/${MY_PN}_${PV}.orig.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="webinterface"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	net-im/jabber-base"
-RDEPEND="${DEPEND}
-	dev-python/twisted-core[${PYTHON_USEDEP}]
-	dev-python/twisted-words[${PYTHON_USEDEP}]
-	dev-python/twisted-web[${PYTHON_USEDEP}]
-	webinterface? ( >=dev-python/nevow-0.4.1[${PYTHON_USEDEP}] )
-	dev-python/pillow[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-python26-warnings.patch"
-	epatch "${FILESDIR}/${P}-pillow-imaging.patch"
-}
-
-src_install() {
-	python_moduleinto ${PN}
-	cp PyAIMt.py ${PN}.py
-	python_domodule ${PN}.py data tools src
-
-	insinto /etc/jabber
-	newins config_example.xml ${PN}.xml
-	fperms 600 /etc/jabber/${PN}.xml
-	fowners jabber:jabber /etc/jabber/${PN}.xml
-	fperms 755 "$(python_get_sitedir)/${PN}/${PN}.py"
-	sed -i \
-		-e "s:<spooldir>[^\<]*</spooldir>:<spooldir>/var/spool/jabber</spooldir>:" \
-		-e "s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
-		"${ED}/etc/jabber/${PN}.xml" || die
-
-	newinitd "${FILESDIR}/${PN}-0.8-initd-r1" ${PN}
-	sed -i -e "s:INSPATH:$(python_get_sitedir)/${PN}:" "${ED}/etc/init.d/${PN}" || die
-	python_fix_shebang "${D}$(python_get_sitedir)/${PN}"
-}
diff --git a/net-im/reaim/Manifest b/net-im/reaim/Manifest
deleted file mode 100644
index a7277045de2d..000000000000
--- a/net-im/reaim/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX reaim 541 BLAKE2B 55c80660b86a8d40817d863e6680f1c956837b443ab678357f6712f21437e154b0d894b93dab45d171b3ef7077281fcdb7a03ea09b24a139580100b541596f06 SHA512 ba5bf5c556e0d50225b28511a96b609fb705491367469086eb67203681c63b9fef22a2650a59977445cd7c8a3d8b0bd50578e68e024e3869a90cdb89354047d4
-DIST reaim-0.8.tar.gz 39944 BLAKE2B 1b0838e472a3cd3107ffbdfabe11e93b86c22e58bfbe0e61dddb22edf37685b885cc24d61479b3878464ec0a247cd2b92c4fb7c197be09d0b4a00e7be9a16e85 SHA512 7a1517e7adf52f2b1b6ec7e4a55c8c74ab099fdf1a654f41b6a0ac13dff39d4706551977d53c2db6f5154cd42f96f14087d2866f563883db9c07b3400ec986b0
-EBUILD reaim-0.8-r2.ebuild 685 BLAKE2B b721c3046059e5da7e4990025d034fd7006f5a10552b184989c4a02138394f7667ac6e11fe93d5748f572216320eaf8e7bd56e6cf38d37fc9869e289346fb391 SHA512 1d594e9cfeac434e3b9780bbc12a591710f9642382d94965484a907b2bd1b3a5179920eacf50aa5293ba748eb9e9237272aafd298841062bfe9e300d47e5abe7
-MISC metadata.xml 242 BLAKE2B 5331d73df3e079ce8d0eb0a91527da666a57ab130d79c343fc7e7ff8a9a75214e7293103269733dfd8d3bdb4925d29a6a9db8310d0a7845f01d7473b33ce5929 SHA512 e52f13e1042e04bd69519b36a795de14ba97c9f0be16cbc00ca570c6a1588f3d84cfefcd5b7e3332bbdafbf947e2a44b31c736eabcd9e82958a76798944982b1
diff --git a/net-im/reaim/files/reaim b/net-im/reaim/files/reaim
deleted file mode 100644
index 83c4de5ff38e..000000000000
--- a/net-im/reaim/files/reaim
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net iptables
-}
-
-start() {
-	ebegin "Starting reaim"
-	iptables -t nat -A PREROUTING -i eth0 -p tcp --dport 5190 -j REDIRECT --to-ports 5190
-	start-stop-daemon --start --quiet --exec /usr/sbin/reaim
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping reaim"
-	iptables -t nat -D PREROUTING -i eth0 -p tcp --dport 5190 -j REDIRECT --to-ports 5190
-	start-stop-daemon --stop --quiet --exec /usr/sbin/reaim
-	eend $?
-}
diff --git a/net-im/reaim/metadata.xml b/net-im/reaim/metadata.xml
deleted file mode 100644
index 7951268cae31..000000000000
--- a/net-im/reaim/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">reaim</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-im/reaim/reaim-0.8-r2.ebuild b/net-im/reaim/reaim-0.8-r2.ebuild
deleted file mode 100644
index f2f98fe678d0..000000000000
--- a/net-im/reaim/reaim-0.8-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="AIM transport proxy over NAT firewalls"
-HOMEPAGE="http://reaim.sourceforge.net/"
-SRC_URI="mirror://sourceforge/reaim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=sys-apps/sed-4"
-RDEPEND="net-firewall/iptables"
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_prepare() {
-	sed -i -e 's/gcc/$(CC) $(CFLAGS) $(LDFLAGS)/' \
-		-e 's/ -g / /'  Makefile || die "sed failed" #365863
-	default
-}
-
-src_install() {
-	local HTML_DOCS=( html )
-	einstalldocs
-	doman reaim.8
-	dosbin reaim
-	doinitd "${FILESDIR}"/reaim
-}
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index 9ce05d9cd3b6..098a0fa1dd96 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,3 +1,3 @@
 DIST skypeforlinux_8.11.0.4-1.x86_64.rpm 94517788 BLAKE2B 5cec1184c566822dab55a2e01424400d46c9894fe77c0031c59063359c50b017f485ee1505db961fa4dacce9c1bd2634bbabd88b6b03925c4cff80d7a7d9b408 SHA512 580183fb278b12974e28be10cdb13925048e4692ac12e5f1abab219ede12b0ec8567d49e58e2c3a7b4d4bcfc56e3ec1cb91117c0056d86dca7d9f1e2ec363b3e
 EBUILD skypeforlinux-8.11.0.4.ebuild 3688 BLAKE2B 322fcfdb6cdcd715a7d32d35b6fcd3b590642b830bdf92e61ec0ff3de430018c666a2266162f94225285e5d293918c36b810d12d7886c966e68adc8c4282cafd SHA512 75c9b9adf6c9451639528faba26ecb120b6c672772dddf7392d9a2d13786f78018d46e7f2b0fad14a8d3c73c946a750e54c482c32b6d8df3ebd7a5bc71356a0a
-MISC metadata.xml 795 BLAKE2B da666b2ac257898116bb8fcf60bf27947b2261f8f718e6bd9cdf3e2c35e38954659be9499675a425cea0f2a9309fb2ada85b54684651f25463140b7f4e89fde9 SHA512 7c97ba77885e397a00e855ffca0dd1f2aa4e1b9c5780650cac09a729ecf4cce07599179c67b86ace1d7e1cd47eafe3a397e9487b42de56e96a86ffb15947abf9
+MISC metadata.xml 684 BLAKE2B 90b427ff6ed13fb5046a188fc8476d45989bdb717c1a930e81270164d72b565942ecfd4f08821bcf265ef17fa79f515c205b314abd21b2e7335387ab10e7f93a SHA512 8a7481d0a0b8d453f7748491ebf12d34e1deeb2f0bfc618e27e15a1029bf04814afadc3ca169c12f1e7d199ec0deebcdf6369ccc6c6a41a2add78209c257f8c6
diff --git a/net-im/skypeforlinux/metadata.xml b/net-im/skypeforlinux/metadata.xml
index 6b8ada5cd1b6..434173bea000 100644
--- a/net-im/skypeforlinux/metadata.xml
+++ b/net-im/skypeforlinux/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>shentino@gmail.com</email>
-		<name>Raymond Jennings</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>krlgrudzinski@gmail.com</email>
 		<name>Karol Grudziński</name>
 	</maintainer>
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 4e2dccc2f6f6..a602626f362b 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/rbot/Manifest b/net-irc/rbot/Manifest
index e8877ace4d01..5e52882e86c2 100644
--- a/net-irc/rbot/Manifest
+++ b/net-irc/rbot/Manifest
@@ -4,6 +4,6 @@ AUX rbot.conf2 1111 BLAKE2B 22cfbcb92f8d0df664a03b26db6027837463c5f8f543829b772d
 AUX rbot.init 1459 BLAKE2B 3b58ca09d2073ef01f94ae1980ed9203d4cadc1a9512842e1ce53709ddb1cfab15228b41656aca5e69999ca933bfe45c94ac18af214b0e890f04912a56830ba8 SHA512 57f5504829ed7524b70102833a5de168f7ea08e594a92ece6d7c0f2eab7de8c9dd14a6d199c5e63b6298209bdf5de4adcb06aded0c23d05c35f7e9774742ecea
 AUX rbot.init2 1345 BLAKE2B 137df6384fde1e3ee9501ce38b31470605bf308827213924033b291f8aa567e90cb8421be6865f4df269aa9b8cc3b20c4b729f3cc4aaaa90959dec39382752ea SHA512 b3d8b83eea4d429a47657f4f9b6cb0aed6c283aa4e7535307305f33bc84c53c0c82e2b76a7cf45ec192c7db68c71e70ee5b000ffbd6f0ff59039de8f69f88dff
 DIST rbot-0.9.15_p20160325.tar.gz 762685 BLAKE2B 68146d241bd57198e0a7a9e5ae033827116bbe31d3bdc05bf42aa644c5dd900254bbe7317461aa553ad92daac299439721a85cd8dd41033cf38b9e97b268e1ee SHA512 b0bc90ee2c6ddb3cdd92cdd5f3a45520d20bc97327b3d694235f7ba94f13ef3c884d4658b083f71bfee2cbeff3cbc7a57c251c4d28bfee293e2556f64e7b4160
-EBUILD rbot-0.9.15_p20160325-r1.ebuild 5382 BLAKE2B d71fcd0865daacbde61f3baf9135936ccacdb547596c98c8b62386088c9c0e593301c6c2d9f35e5a541d39aee4ed47d40b3836919175399ab16abefdebeab55b SHA512 ba393920dd86537df7b5cd5aa08e76879613783bf90c8a35c5ca6641dcf7dcadcc78dd056fda47c18e78da0edb69ca59105b79d5b1659fd15b05527fa6944a40
-EBUILD rbot-0.9.15_p20160325.ebuild 5078 BLAKE2B 641f3210c99f206c7437fb578db372ae02a0a998de7341cd4a3b682f5de02a92e33abdf67fa0d72c7af5d5e43628b35f65ad576ad0ca2acfc1335f8061ee936f SHA512 d69608ab6e307de540d9a434c9d62edf75aa87c1b1080277bdb888a1c280689e87f846a3afa850be3cae6d610c327fd887deeadcb2b8a516a0a0859e7a8591a3
+EBUILD rbot-0.9.15_p20160325-r1.ebuild 5325 BLAKE2B 2648782ddb6029ed133b1c1093e9ddd43d1a98c26b8346441e96173da00443617de8f2ad115b62f71fb84cb884c031e5016dafb88c02dd1143b306b40ca446de SHA512 42df0523d058827fcac570f4f6e1790774f42b781f2cee460823c56b717fa7b3540d5b4b388bfa59c1edfa650dcfdba7951ca0fcbeec47bd95da95c1aaa1ea14
+EBUILD rbot-0.9.15_p20160325.ebuild 5021 BLAKE2B 1a8db5a4f0f31cc86032ebb0132448829679ae53f784f86a6e9982e312d3a83066bc18b5c547cd25ac454370817fc0a3240b7a0c17a5046584dd64d4bdb5c8fe SHA512 e2bb206bcc8439fe93474caa8d77b639340c42b77bbc48f425fbc1bdb818d97d726e4f9eda023c7f31963ffaf71a3d1b70e775d4769c1e34a59824327b38f35f
 MISC metadata.xml 2656 BLAKE2B 47090f64bb983dfca142443a0f35ae99fa57927781177255e375e414c61a7555507d0110259f3a9ace86e42fadb237bbb5aecc251371bee9ff8ddaf1d414ea36 SHA512 03c3fc8b4f700eb1039feb5f656f772a55c3b928658e494c542cf69d3325d08b2723e23cfb753afe5ea3bad240011e642a4923e9a84673cba1e06b24cfc60918
diff --git a/net-irc/rbot/rbot-0.9.15_p20160325-r1.ebuild b/net-irc/rbot/rbot-0.9.15_p20160325-r1.ebuild
index 9d5251d93d3f..c176e4cd985f 100644
--- a/net-irc/rbot/rbot-0.9.15_p20160325-r1.ebuild
+++ b/net-irc/rbot/rbot-0.9.15_p20160325-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,10 +19,6 @@ IUSE="spell aspell timezone translator shorturl nls figlet
 ILINGUAS="zh_CN zh_TW ru nl de fi fr it ja"
 RUBY_S="${PN}-${GITHUB_COMMIT}"
 
-for lang in $ILINGUAS; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
 RUBY_PATCHES=( rbot-rakefile-gettext.patch )
 
 RDEPEND+="
@@ -128,7 +124,7 @@ all_ruby_compile() {
 	# need to add them later.
 	if use nls; then
 		strip-linguas ${ILINGUAS}
-		if [[ -n ${LINGUAS} ]]; then
+		if [[ -n ${LINGUAS+set} ]]; then
 			# As the the language name used by the rbot data files does
 			# not correspond to the ISO codes we usually use for LINGUAS,
 			# the following list of local varables will work as a
@@ -143,7 +139,7 @@ all_ruby_compile() {
 			local lang_rbot_ja="japanese"
 
 			for lang in ${ILINGUAS}; do
-				use linguas_${lang} && continue
+				has ${lang} ${LINGUAS} && continue
 
 				lang_varname="lang_rbot_${lang}"
 				lang_rbot=${!lang_varname}
diff --git a/net-irc/rbot/rbot-0.9.15_p20160325.ebuild b/net-irc/rbot/rbot-0.9.15_p20160325.ebuild
index 48af140afb3e..ee7d5458ae7e 100644
--- a/net-irc/rbot/rbot-0.9.15_p20160325.ebuild
+++ b/net-irc/rbot/rbot-0.9.15_p20160325.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,10 +19,6 @@ IUSE="spell aspell timezone translator shorturl nls figlet
 ILINGUAS="zh_CN zh_TW ru nl de fi fr it ja"
 RUBY_S="${PN}-${GITHUB_COMMIT}"
 
-for lang in $ILINGUAS; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
 RUBY_PATCHES=( rbot-rakefile-gettext.patch )
 
 RDEPEND+="
@@ -118,7 +114,7 @@ all_ruby_compile() {
 	# need to add them later.
 	if use nls; then
 		strip-linguas ${ILINGUAS}
-		if [[ -n ${LINGUAS} ]]; then
+		if [[ -n ${LINGUAS+set} ]]; then
 			# As the the language name used by the rbot data files does
 			# not correspond to the ISO codes we usually use for LINGUAS,
 			# the following list of local varables will work as a
@@ -133,7 +129,7 @@ all_ruby_compile() {
 			local lang_rbot_ja="japanese"
 
 			for lang in ${ILINGUAS}; do
-				use linguas_${lang} && continue
+				has ${lang} ${LINGUAS} && continue
 
 				lang_varname="lang_rbot_${lang}"
 				lang_rbot=${!lang_varname}
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 0f54e5aa9234..95798233beb8 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -2,8 +2,8 @@ AUX weechat-1.2-tinfo.patch 874 BLAKE2B 5b720aaf45d1ff7f7792ca21ff79919b258fe16c
 DIST weechat-1.9.1.tar.xz 1877428 BLAKE2B e7595735547699cfb20f653bbe515555b5d7e772e1bc1aecb4e95f1f4fd402a315698790e961305daf7d0bd6c5f9f7889c00efdf115f7182287965428b79d469 SHA512 552e9248e86db7fe53cd6539084e6c5e8548b8858b27c02326d04925d81ef09e123225af5c1f5550b262be5a1249fd8750fdda8d9877c3df918cc30b5e0953fa
 DIST weechat-2.0.1.tar.xz 1967336 BLAKE2B 256f4bab45834ed2798490234c9417b8b8e4d06d0ed09f5779ad9d32321ab9aec58c38f4b048de319e4f46809313186462208258ca2d78d1e0470fa2014e7472 SHA512 3947e79a0ac8dce7605905c39039bedf9ba2af4778ee6905f12ca75786b62f3081568ce9426be251e65bad2837ddcf0664cbb08059f898d4ac60171325a94e74
 DIST weechat-2.0.tar.xz 1967636 BLAKE2B b4ee37a7c8da4cd724ada44f454979326ec1186254d197c538de13c148b52988ddeff23d432240404516c8f81d8588347c6ea5313572b4815d716f80e82f85a4 SHA512 771618c09fb24182f86304af8c12e158e3d97afbc51219d1f4c5f9ec102aac15c4511a6301141d47f67e385f41bf0ba91e3df795ffdd78a19d1f6a5b1121e951
-EBUILD weechat-1.9.1.ebuild 3917 BLAKE2B d1c8ab83d7ef18b1dd6458b240926dfa1499d0ee495c3fe90303490a69cc74755250bf4f4493e8a621eb892876c03b1ba15843879377b1de9851993046cc8594 SHA512 279b30076a4b16256f3c0fd96b1b3a1a61b0c6a50e5a0ca41aed001ff76142d6ead95e60a2cb16548e38d7959aab3ec7b5a8b70739baa0f7f20c8f3c66305a47
-EBUILD weechat-2.0.1.ebuild 4016 BLAKE2B 0fcf13ce72cf6cc15b6e3422011e3e49c038b0953b41b01e7fa51438452176e97d1cfe31212d47a759488b82fe3355e5fec5b1514ae49ffafdf08373096d90d4 SHA512 75f18121a2d241c6fa478470c50f0c7a49327f60f2edea8dfa00c217d2846cd79f1a0165bc975648f6a8cf0d09f172200da6a14268cab27b863adad1df9c43e5
-EBUILD weechat-2.0.ebuild 4016 BLAKE2B 0fcf13ce72cf6cc15b6e3422011e3e49c038b0953b41b01e7fa51438452176e97d1cfe31212d47a759488b82fe3355e5fec5b1514ae49ffafdf08373096d90d4 SHA512 75f18121a2d241c6fa478470c50f0c7a49327f60f2edea8dfa00c217d2846cd79f1a0165bc975648f6a8cf0d09f172200da6a14268cab27b863adad1df9c43e5
-EBUILD weechat-9999.ebuild 4016 BLAKE2B 0fcf13ce72cf6cc15b6e3422011e3e49c038b0953b41b01e7fa51438452176e97d1cfe31212d47a759488b82fe3355e5fec5b1514ae49ffafdf08373096d90d4 SHA512 75f18121a2d241c6fa478470c50f0c7a49327f60f2edea8dfa00c217d2846cd79f1a0165bc975648f6a8cf0d09f172200da6a14268cab27b863adad1df9c43e5
+EBUILD weechat-1.9.1.ebuild 3911 BLAKE2B cba02d1251dd464f059c096bba8aef464b6f767adea67b84bb364c5c95fc7947f601bfd7f048d232288db7930820079e739ba9943fe16a78f8c69a155eb43f6f SHA512 6683148f66aba87e8e662f607e76dacec46c28dbd76ce598a8c881fc9581bf8f92ae1e752656553479e96de5de870f4e9ebcd5b0059b06cf36ae41419f68d7f4
+EBUILD weechat-2.0.1.ebuild 4010 BLAKE2B 8e08f9a541cd0466342804f27bcd73fe3be1087dc2e2bbca7014ff55c16844ee1259df371598a6b96f2e77b13473c83f367e787101aa45fa8ac3e092f59f843c SHA512 4fff7e01f110cb1dfffa62365e877d62a8330b1d56a8f5bd23213d548d908f250b4db824305d85e0647f1659642d169f4e512a3abed5f412201ef9279f8dfadb
+EBUILD weechat-2.0.ebuild 4010 BLAKE2B 8e08f9a541cd0466342804f27bcd73fe3be1087dc2e2bbca7014ff55c16844ee1259df371598a6b96f2e77b13473c83f367e787101aa45fa8ac3e092f59f843c SHA512 4fff7e01f110cb1dfffa62365e877d62a8330b1d56a8f5bd23213d548d908f250b4db824305d85e0647f1659642d169f4e512a3abed5f412201ef9279f8dfadb
+EBUILD weechat-9999.ebuild 4010 BLAKE2B 8e08f9a541cd0466342804f27bcd73fe3be1087dc2e2bbca7014ff55c16844ee1259df371598a6b96f2e77b13473c83f367e787101aa45fa8ac3e092f59f843c SHA512 4fff7e01f110cb1dfffa62365e877d62a8330b1d56a8f5bd23213d548d908f250b4db824305d85e0647f1659642d169f4e512a3abed5f412201ef9279f8dfadb
 MISC metadata.xml 903 BLAKE2B 74f1e6930fb209c9d74ca9ff7a8c0b82900c8aac369612ef4c16cc4393fabe24770bc1734d20b261dfcfc021259e1df9e555e1d53605296e0847939d3ce41c40 SHA512 26d85549cc0b0e61cb576a50740cd289432dca90ff92e0d0162a430ff89959233aa002dee0018780e51607cdae85a866ac6db77fe22d2c8631590a33a05ff5d5
diff --git a/net-irc/weechat/weechat-1.9.1.ebuild b/net-irc/weechat/weechat-1.9.1.ebuild
index e28f1929648b..39521532b3fc 100644
--- a/net-irc/weechat/weechat-1.9.1.ebuild
+++ b/net-irc/weechat/weechat-1.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ PLUGINS="+alias +buflist +charset +exec +fifo +logger +relay +scripts +spell +tr
 # dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
 SCRIPT_LANGS="guile lua +perl +python ruby tcl"
 LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
-IUSE="doc nls +ssl test ${LANGS// / linguas_} ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+IUSE="doc nls +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
@@ -76,7 +76,7 @@ src_prepare() {
 	# install only required translations
 	local i
 	for i in ${LANGS} ; do
-		if ! use linguas_${i} ; then
+		if ! has ${i} ${LINGUAS-${i}} ; then
 			sed -i \
 				-e "/${i}.po/d" \
 				po/CMakeLists.txt || die
@@ -86,7 +86,7 @@ src_prepare() {
 	# install only required documentation ; en always
 	for i in $(grep add_subdirectory doc/CMakeLists.txt \
 			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
-		if ! use linguas_${i} ; then
+		if ! has ${i} ${LINGUAS-${i}} ; then
 			sed -i \
 				-e '/add_subdirectory('${i}')/d' \
 				doc/CMakeLists.txt || die
diff --git a/net-irc/weechat/weechat-2.0.1.ebuild b/net-irc/weechat/weechat-2.0.1.ebuild
index 59575ed9f9d6..dd1313a0c730 100644
--- a/net-irc/weechat/weechat-2.0.1.ebuild
+++ b/net-irc/weechat/weechat-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ PLUGINS="+alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spe
 # dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
 SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
 LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
-IUSE="doc nls +ssl test ${LANGS// / linguas_} ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+IUSE="doc nls +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
@@ -77,7 +77,7 @@ src_prepare() {
 	# install only required translations
 	local i
 	for i in ${LANGS} ; do
-		if ! use linguas_${i} ; then
+		if ! has ${i} ${LINGUAS-${i}} ; then
 			sed -i \
 				-e "/${i}.po/d" \
 				po/CMakeLists.txt || die
@@ -87,7 +87,7 @@ src_prepare() {
 	# install only required documentation ; en always
 	for i in $(grep add_subdirectory doc/CMakeLists.txt \
 			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
-		if ! use linguas_${i} ; then
+		if ! has ${i} ${LINGUAS-${i}} ; then
 			sed -i \
 				-e '/add_subdirectory('${i}')/d' \
 				doc/CMakeLists.txt || die
diff --git a/net-irc/weechat/weechat-2.0.ebuild b/net-irc/weechat/weechat-2.0.ebuild
index 59575ed9f9d6..dd1313a0c730 100644
--- a/net-irc/weechat/weechat-2.0.ebuild
+++ b/net-irc/weechat/weechat-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ PLUGINS="+alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spe
 # dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
 SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
 LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
-IUSE="doc nls +ssl test ${LANGS// / linguas_} ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+IUSE="doc nls +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
@@ -77,7 +77,7 @@ src_prepare() {
 	# install only required translations
 	local i
 	for i in ${LANGS} ; do
-		if ! use linguas_${i} ; then
+		if ! has ${i} ${LINGUAS-${i}} ; then
 			sed -i \
 				-e "/${i}.po/d" \
 				po/CMakeLists.txt || die
@@ -87,7 +87,7 @@ src_prepare() {
 	# install only required documentation ; en always
 	for i in $(grep add_subdirectory doc/CMakeLists.txt \
 			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
-		if ! use linguas_${i} ; then
+		if ! has ${i} ${LINGUAS-${i}} ; then
 			sed -i \
 				-e '/add_subdirectory('${i}')/d' \
 				doc/CMakeLists.txt || die
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index 59575ed9f9d6..dd1313a0c730 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ PLUGINS="+alias +buflist +charset +exec +fset +fifo +logger +relay +scripts +spe
 # dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
 SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
 LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
-IUSE="doc nls +ssl test ${LANGS// / linguas_} ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+IUSE="doc nls +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
@@ -77,7 +77,7 @@ src_prepare() {
 	# install only required translations
 	local i
 	for i in ${LANGS} ; do
-		if ! use linguas_${i} ; then
+		if ! has ${i} ${LINGUAS-${i}} ; then
 			sed -i \
 				-e "/${i}.po/d" \
 				po/CMakeLists.txt || die
@@ -87,7 +87,7 @@ src_prepare() {
 	# install only required documentation ; en always
 	for i in $(grep add_subdirectory doc/CMakeLists.txt \
 			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
-		if ! use linguas_${i} ; then
+		if ! has ${i} ${LINGUAS-${i}} ; then
 			sed -i \
 				-e '/add_subdirectory('${i}')/d' \
 				doc/CMakeLists.txt || die
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index caaa4dab9f75..0000e43f6afa 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/ignition-msgs/Manifest b/net-libs/ignition-msgs/Manifest
index 7414db84170b..9373bf6cb6e0 100644
--- a/net-libs/ignition-msgs/Manifest
+++ b/net-libs/ignition-msgs/Manifest
@@ -1,3 +1,5 @@
 DIST ignition-msgs-0.7.0.tar.bz2 327753 BLAKE2B 7709b7fe5bc8d3ebd16ae30ac91d088a7e3891bc378f24ca48b34b88c541c3583182c3d9d3d6c72b7005f01ae5383f6391b4e754adb26f8ab06e9a31680e99dd SHA512 78b35eb6c9b53bd567d227191009cfb8628afa70f244cf05ad9440f370aa9c51a649160c9c65d13e81a48a3a34553614e9835e9a37fb91cad330c363f0a5f62f
+DIST ignition-msgs-1.0.0.tar.bz2 315469 BLAKE2B a481f740ffb0795e64d1fa222ea4925e09839d56212f5218b4849c6f49a3e3a899af757ac1ad1997a95b57a401bac831a754ffa351cd142e6e9cbf07e7bae0ac SHA512 3ec16d68c35b1c7d77373eb3ed72304f5a990f57fc15a91f49af49bf0c6b43e6f31e888e4b0a8308cc63840aa995dd423d5b23d28a98f132b4be13c46f5d7d6e
 EBUILD ignition-msgs-0.7.0.ebuild 901 BLAKE2B fa49ae9ffcf70f138afb7cb844ccb581b4ba27cde86627925473ed8c874445608ab635024cee3b341b09c9743f8b087e7ef419e3bfa5a7ac6bee1f602a6e7f3a SHA512 58e5851d77dfb52085c7f3311829a9076d8f3a54d1917aff7587d054e164646f10e47f7ea540eff93b19cfa3a829f6993b28a291501ec45be2e85a7ea6b11489
+EBUILD ignition-msgs-1.0.0.ebuild 652 BLAKE2B dbea1b7abe06c9326cc719f7000db982cfee55e918c71aa32e01649bf3a751cdd00c790efb9c7bfb61f627fa1b16f456ec0ea98cf0eff945f1a7ae81e191215a SHA512 c1dbc7a56426767b4e7e77f4e2eb6749f6b2e6240daf5f5fb645954843fa78328ee1c0efd5fbe96b21835b8cd1eac3376b1f053aa509d4709dfeac438ecade1f
 MISC metadata.xml 342 BLAKE2B 8d111972a5a99679d9ad258649ea0308bc682663888b6228e92948dd88ee3e6d19bf04d940801f5d3ca069ba9173f248d557c2d44f304c86c074c3f68b0d9341 SHA512 4ec21d1b2f7525d07b3bbc624ec55edf1282652c74ee548e77c1b25c0242b0f01f846bdbe2203dca8c0217f25e5fc50ad6ff57f33694ea223941c8aaa8bc35fe
diff --git a/net-libs/ignition-msgs/ignition-msgs-1.0.0.ebuild b/net-libs/ignition-msgs/ignition-msgs-1.0.0.ebuild
new file mode 100644
index 000000000000..6b7fa14bffae
--- /dev/null
+++ b/net-libs/ignition-msgs/ignition-msgs-1.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="Protobuf messages and functions for robot applications"
+HOMEPAGE="http://ignitionrobotics.org/libraries/messages https://bitbucket.org/ignitionrobotics/ign-msgs"
+SRC_URI="https://osrf-distributions.s3.amazonaws.com/ign-msgs/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-libs/protobuf:=[${MULTILIB_USEDEP}]
+	sci-libs/ignition-math:4=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-util/ignition-cmake[${MULTILIB_USEDEP}]"
+CMAKE_BUILD_TYPE=RelWithDebInfo
diff --git a/net-libs/ignition-transport/Manifest b/net-libs/ignition-transport/Manifest
index 1dc3bbe39cb7..b9a7c877385e 100644
--- a/net-libs/ignition-transport/Manifest
+++ b/net-libs/ignition-transport/Manifest
@@ -1,5 +1,3 @@
-DIST ignition-transport3-3.0.1.tar.bz2 384679 BLAKE2B 1aace81c8d708dc06dedb53453718b019b1472c6c787fddb3b76c9e97cf2d518db2e037c20451b10c31db8a31d87b70f93c8339515a98f376bb660798bf07cd8 SHA512 a2e80d3b5a8b0ca327bd8892d1177f8316d3e2dbbb6f064626e00eb5e67572519377290973527d69ab4a8ff3970c350a7066625429d3a8403a5be8d491fb89c6
 DIST ignition-transport3-3.1.0.tar.bz2 385946 BLAKE2B 0ae44f0e1cd17369de9ee39f0d128ee5edbc68c1be672be5476d7cf8c161f59c069af63cec1966f6e0ba1c9e56ade0563b6546f7f285bdc49b6941939e2a4379 SHA512 438ab49f1c506e098c00becccf1856b3e0129d60f9aca32f713a74b38aefb178833353ff479c8512e7ffec812bdc0a06eb7f28f09766dc0cc5a9707184151555
-EBUILD ignition-transport-3.0.1.ebuild 1049 BLAKE2B 4dadc025a21222df813cddadc068aaed5d83c81c405842096ad4fc2cc37185eb2206557c61864590683346a755fbbce5ce0b1d851540c7b23bf25deee19eea82 SHA512 0f327196dcff9067c14c14b8287bff381654f6ec84687bd3bf2c953c0b5e006eb0f535655c9d35d358a83b0373a012fc0cde14e994c1d68e89ac4a3f943c84ca
-EBUILD ignition-transport-3.1.0.ebuild 1049 BLAKE2B 4dadc025a21222df813cddadc068aaed5d83c81c405842096ad4fc2cc37185eb2206557c61864590683346a755fbbce5ce0b1d851540c7b23bf25deee19eea82 SHA512 0f327196dcff9067c14c14b8287bff381654f6ec84687bd3bf2c953c0b5e006eb0f535655c9d35d358a83b0373a012fc0cde14e994c1d68e89ac4a3f943c84ca
+EBUILD ignition-transport-3.1.0-r1.ebuild 1050 BLAKE2B 01636b931f62d40c81a83040c3679d7ac5d7db582536f1cce86511ee2ece4aaf54d22545993eb2877a5820fa2044e63bb7f2ce2d56482e366e6626aeda1abad9 SHA512 0f693828d0a4ac3751570d6ea58b0bff3010f4a84e4d2290cd905139c6ceaa9685f8219d44162c046fab2377fdb96ba9386d447abceb9b64977d9bb2c9b8bc89
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/net-libs/ignition-transport/ignition-transport-3.0.1.ebuild b/net-libs/ignition-transport/ignition-transport-3.1.0-r1.ebuild
index 8c6b71bda1c3..d90f82ffa1b4 100644
--- a/net-libs/ignition-transport/ignition-transport-3.0.1.ebuild
+++ b/net-libs/ignition-transport/ignition-transport-3.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND="
-	net-libs/ignition-msgs:=
+	net-libs/ignition-msgs:0=
 	dev-libs/protobuf:=
 	>=net-libs/zeromq-3.2.0:=
 	sys-apps/util-linux
diff --git a/net-libs/ignition-transport/ignition-transport-3.1.0.ebuild b/net-libs/ignition-transport/ignition-transport-3.1.0.ebuild
deleted file mode 100644
index 8c6b71bda1c3..000000000000
--- a/net-libs/ignition-transport/ignition-transport-3.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils vcs-snapshot flag-o-matic
-
-DESCRIPTION="Combines ZeroMQ with Protobufs to create a fast and efficient message passing system"
-HOMEPAGE="http://ignitionrobotics.org/libraries/transport"
-SRC_URI="http://gazebosim.org/distributions/ign-transport/releases/${PN}3-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="3/3"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	net-libs/ignition-msgs:=
-	dev-libs/protobuf:=
-	>=net-libs/zeromq-3.2.0:=
-	sys-apps/util-linux
-	net-libs/cppzmq
-"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-S="${WORKDIR}/${PN}3-${PV}"
-
-src_configure() {
-	# upstream appends this conditionally...
-	append-flags "-fPIC"
-	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
-	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
-	cmake-utils_src_configure
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 22b179e21ddb..a6b49f1ad826 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk-core-sounds/Manifest b/net-misc/asterisk-core-sounds/Manifest
index fa5aa0b273e4..b33fb935b051 100644
--- a/net-misc/asterisk-core-sounds/Manifest
+++ b/net-misc/asterisk-core-sounds/Manifest
@@ -70,6 +70,6 @@ DIST asterisk-core-sounds-ru-ulaw-1.4.21.tar.gz 8299885 BLAKE2B 849acbf583425e1b
 DIST asterisk-core-sounds-ru-ulaw-1.4.22.tar.gz 8460881 BLAKE2B f9c6b4ead0a31cace57517f72495850313732e5d2032ab40b0b63bda153feef305b7f059d55333ba984187952364b4464604bff85d91b8c9fc05c2792f92f15c SHA512 f563a50512e43a9b8eeb926588638698fbebfb7799afd33c6218f42c424cbe0a983b4e7fd466624e5ea43dc24519bc770beeb64fe74c06f2891cb8f39776de2a
 DIST asterisk-core-sounds-ru-wav-1.4.21.tar.gz 16446330 BLAKE2B 8c09a8b49f9de856eda58c22bc86a24d91727e19f2a1fdd33c6428ed769df492a5e7e1c93d680b06db4ee293a7a3031b786f128fb917e6f326b57fa0d9d87233 SHA512 951a7b156cf7f92e9640f6704bd12013d73d688aaaff8ab18d15ea0c99f10fa0386e12b65c086a02536d8cd68c372c686e4485cff3afc4f40933d14bdb41e109
 DIST asterisk-core-sounds-ru-wav-1.4.22.tar.gz 16591836 BLAKE2B 95b16e2680753c2b141f6e5a5b12f06e87d6e2c998d941b9ea8d3e1229d8efa511b59a2aa5d00ad4f39ef0acc69953e933878cf60763c3f3daecf8497150bf41 SHA512 1f8484da7975bd91b38d8354ec84110892c42b44d2a0cbcd9a2d5a3756e56e0446d388e0e9343be8c3561c4a02cf55cd135d86051db5b4d232575ae4c4b60d1b
-EBUILD asterisk-core-sounds-1.4.21-r1.ebuild 1860 BLAKE2B d3080e33ed92329359c496bf2395de9833620043adb5906abb8bad0b20622f2763d02a5c797ec9dc1dd97758594538b2111f2bc5ccf162ce73f26150227cfb55 SHA512 c43c5e602a6f3595e54694a409c755e4c1bf5ba454f453d03367a05fa635724241ad35b13ffcac5942784bfeb553c834847cdb2d55ea2aaa279088e47225d42c
-EBUILD asterisk-core-sounds-1.4.22.ebuild 1872 BLAKE2B 772f459227c3df5428bb29b2190d2eb18e4b50e6fdb3c50e7e0ff1587018c6dd4722fd64df8dd13168fb99ecb533899c400de54e70ad536813fa4e076992c620 SHA512 d3f2a30dedf14a37fcc24f9b0abde3b3c1c66ffd9b97c78d1c326e150e2d653b868264ba414f453916092c13282a07cb92f65ba679dd9c11cae7cd0c15efbe28
+EBUILD asterisk-core-sounds-1.4.21-r1.ebuild 1851 BLAKE2B d5cc2da39d0f1d33af354fec4ef895349ebf4819bf0ec7d6c2d5ade325a77f6c86992c50926f1c71a2fa4bd942341ac28f1e75e21f8fdd6f785aed62ff968bb3 SHA512 41db422df01d02b098e88972d5a71c73accbfea198837c5dbc682c5dbc6c707ee33136bca50e1b304d4aec3b43673140fcba8ccf4ecf323be1cb98f88be63200
+EBUILD asterisk-core-sounds-1.4.22.ebuild 1863 BLAKE2B 0ce9f5c00b125c829c050a76d21ffc641b56ac77ba922574e3d48dce70b36c98bd42d441ab70cf3de4211922c5ffc65259e83fda4334bd4157386f2c452b8a45 SHA512 59f5867216f793ea1f4eb9fca3256c7e1ec6c0c21b19e17ad9507f6ed07aeb51d22aaf317f8867905e0ada4d6c88312acab15727902ee99f0bf60920cab6904e
 MISC metadata.xml 846 BLAKE2B 581e9e2325c925ddc9bffcdb3d545e2dc5d862a06bf79875eccda7d18412e24dcf3ac4c3293474225a38189dd534030a5d5095dec992dd52c0798b4287a6a921 SHA512 d09b435f10066acf15bb1b6c2454e4a207e7604eae199958bfc9de6f130f4f3380af5b3d95d686cc20dfabe38b58f9c3dc308517b63f8ff6675779b97ef471d2
diff --git a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.21-r1.ebuild b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.21-r1.ebuild
index 975f4c9cc506..a748f38a57bf 100644
--- a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.21-r1.ebuild
+++ b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.21-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
 
 DESCRIPTION="Core sounds for asterisk"
 HOMEPAGE="http://www.asterisk.org/"
-LINGUAS="^en fr es ru" # ^ is used to indicate to the loops below to NOT set this as an optional
+MY_L10N="^en fr es ru" # ^ is used to indicate to the loops below to NOT set this as an optional
 CODECS="alaw g722 g729 +gsm siren7 siren14 sln16 ulaw wav"
 
 SRC_URI=""
@@ -13,8 +13,8 @@ IUSE=""
 for c in ${CODECS}; do
 	[[ "${c}" != +* ]] && IUSE+=" ${c}"
 done
-for l in ${LINGUAS}; do
-	[[ "${l}" != ^* ]] && IUSE+=" linguas_${l}" && SRC_URI+=" linguas_${l}? ("
+for l in ${MY_L10N}; do
+	[[ "${l}" != ^* ]] && IUSE+=" l10n_${l}" && SRC_URI+=" l10n_${l}? ("
 	for c in ${CODECS}; do
 		[[ "${c}" != +* ]] &&
 		SRC_URI+=" ${c#+}? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/${PN}-${l#^}-${c#+}-${PV}.tar.gz )" ||
@@ -47,8 +47,8 @@ src_unpack() {
 }
 
 src_install() {
-	for l in ${LINGUAS}; do
-		if [[ "${l}" = ^* ]] || use linguas_${l}; then
+	for l in ${MY_L10N}; do
+		if [[ "${l}" = ^* ]] || use l10n_${l}; then
 			l="${l#^}"
 			ebegin "Installing documentation for \"${l}\""
 				dodoc ${l}/CHANGES-${PN%-sounds}-${l}-${PV} ${l}/${PN#asterisk-}-${l}.txt
diff --git a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.22.ebuild b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.22.ebuild
index 23d28f91884a..ce1d059fd250 100644
--- a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.22.ebuild
+++ b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.22.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
 
 DESCRIPTION="Core sounds for asterisk"
 HOMEPAGE="http://www.asterisk.org/"
-LINGUAS="^en fr es ru" # ^ is used to indicate to the loops below to NOT set this as an optional
+MY_L10N="^en fr es ru" # ^ is used to indicate to the loops below to NOT set this as an optional
 CODECS="alaw g722 g729 +gsm siren7 siren14 sln16 ulaw wav"
 
 SRC_URI=""
@@ -13,8 +13,8 @@ IUSE=""
 for c in ${CODECS}; do
 	[[ "${c}" != +* ]] && IUSE+=" ${c}"
 done
-for l in ${LINGUAS}; do
-	[[ "${l}" != ^* ]] && IUSE+=" linguas_${l}" && SRC_URI+=" linguas_${l}? ("
+for l in ${MY_L10N}; do
+	[[ "${l}" != ^* ]] && IUSE+=" l10n_${l}" && SRC_URI+=" l10n_${l}? ("
 	for c in ${CODECS}; do
 		[[ "${c}" != +* ]] &&
 		SRC_URI+=" ${c#+}? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/${PN}-${l#^}-${c#+}-${PV}.tar.gz )" ||
@@ -47,8 +47,8 @@ src_unpack() {
 }
 
 src_install() {
-	for l in ${LINGUAS}; do
-		if [[ "${l}" = ^* ]] || use linguas_${l}; then
+	for l in ${MY_L10N}; do
+		if [[ "${l}" = ^* ]] || use l10n_${l}; then
 			l="${l#^}"
 			ebegin "Installing documentation for \"${l}\""
 				dodoc ${l}/CHANGES-${PN%-sounds}-${l}-${PV} ${l}/${PN#asterisk-}-${l}.txt
diff --git a/net-misc/asterisk-extra-sounds/Manifest b/net-misc/asterisk-extra-sounds/Manifest
index cc2de181502b..7fd277005533 100644
--- a/net-misc/asterisk-extra-sounds/Manifest
+++ b/net-misc/asterisk-extra-sounds/Manifest
@@ -16,5 +16,5 @@ DIST asterisk-extra-sounds-fr-siren7-1.4.11.tar.gz 7128320 BLAKE2B cfc9b2fb2734d
 DIST asterisk-extra-sounds-fr-sln16-1.4.11.tar.gz 48517491 BLAKE2B 80b6e4da30b5e2c65c48c81bfa44cd14bff3eb19fbb3d6385dbe7fbca7e39a881154f6c1fa839360874c65f6e4916ef9574006041ef0f68ee9245c7340d1e46e SHA512 f8b0a1eebd93fdda707846dc73d30418462a07572962cbe822eb11ed5c2ce7741b185b0e4abd05c47d0c2c53e817c47b3c493d94e92e50848c7a270e87e9a586
 DIST asterisk-extra-sounds-fr-ulaw-1.4.11.tar.gz 11818928 BLAKE2B e6669c4b041e96fda7beed7de4af3ad876c28419e639b4d45797c00272ac03fb71ce23cd584aca480e203e37585a1e793e42514f83341a745e4111ed49bdba54 SHA512 34ba851729186250a3fc459b685c0a4d475e32820e4a49b3a1b2c038e0252a71a0637e1bfd67e0bd4960cb90ec24f8cb28435a049fcc91f7b3ed4f0f1009b0ab
 DIST asterisk-extra-sounds-fr-wav-1.4.11.tar.gz 23829634 BLAKE2B 8d45ecaa92673599430a9d652e4965cf1d7d8557bbcc07d49238e21a22b7dbf35fc1bf41f66c35df298bdd2af189a3f63dc3aab7df43961003a0cd42fd8f19fc SHA512 4482f7a95fcd5b43ead86e877e4df88d017ea003bbe56c4813fe6814956fb015d4359bd1257513b34c3d80ac171472c0749e534ede6ab9aecf42a589ad76c0ba
-EBUILD asterisk-extra-sounds-1.4.11.ebuild 1795 BLAKE2B 9a8175b2806d7f2666e90baf22415d7010ba563e528d65ad63fe35352a4b305d2ad38f051d2e8353649711055448a5d62a19bac88b84458968f75e189d32fec1 SHA512 050fd1b23dd1873529a871327dd88f77a8d8fcd3f49145878d90ec82f2e1326de930a704708b0ab38c38c052605448382ad65e707db5fe68459b176df34e8b62
+EBUILD asterisk-extra-sounds-1.4.11.ebuild 1786 BLAKE2B 75eba6eaa8701dc7d11027224cc111caa59012d2f3bfdce7c4589e407aafd284785a9596f65fa75ad19134188909c34ab4e62c7bdc34e27918fa8b469f885195 SHA512 eb48446e4aa8aac3a001aea9c251800dec0114f3a03b08cac37ae82d9af11b04001b96e4dda64647a6f012b2dff3c0216f4f588fd3176c9d6d2281e6bf6ac57d
 MISC metadata.xml 917 BLAKE2B 267b110b5ef3fea60a4fba48147dc7d47897f0b5854039df6e8a47f3c2ce3ddb94f832926b28853caa6fa3e6dbfd0182cd63cf07c4377e796b9ad467ccec1ff8 SHA512 834aff23b944bdd2ad940458323fee9db3e4b9cf3b2e83265bc59a1c7a1b9d992c244b834fbf465a1f3d135470741b27dfa150193f9371519e19d8550a86742a
diff --git a/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.4.11.ebuild b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.4.11.ebuild
index 8ca668e30853..7f2584c7fa43 100644
--- a/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.4.11.ebuild
+++ b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.4.11.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
 
 DESCRIPTION="Extra sounds for asterisk"
 HOMEPAGE="http://www.asterisk.org/"
-LINGUAS="^en fr" # ^ is used to indicate to the loops below to NOT set this as an optional
+MY_L10N="^en fr" # ^ is used to indicate to the loops below to NOT set this as an optional
 CODECS="alaw g722 g729 +gsm siren7 siren14 sln16 ulaw wav"
 
 SRC_URI=""
 IUSE="${CODECS}"
-for l in ${LINGUAS}; do
-	[[ "${l}" != ^* ]] && IUSE+=" linguas_${l}" && SRC_URI+=" linguas_${l}? ("
+for l in ${MY_L10N}; do
+	[[ "${l}" != ^* ]] && IUSE+=" l10n_${l}" && SRC_URI+=" l10n_${l}? ("
 	for c in ${CODECS}; do
 		SRC_URI+=" ${c#+}? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/${PN}-${l#^}-${c#+}-${PV}.tar.gz )"
 	done
@@ -39,8 +39,8 @@ src_unpack() {
 }
 
 src_install() {
-	for l in ${LINGUAS}; do
-		if [[ "${l}" = ^* ]] || use linguas_${l}; then
+	for l in ${MY_L10N}; do
+		if [[ "${l}" = ^* ]] || use l10n_${l}; then
 			l="${l#^}"
 			dodoc ${l}/CHANGES-${PN%-sounds}-${l}-${PV} ${l}/${PN#asterisk-}-${l}.txt
 			rm ${l}/CHANGES-${PN%-sounds}-${l}-${PV} ${l}/${PN#asterisk-}-${l}.txt
diff --git a/net-misc/bopm/Manifest b/net-misc/bopm/Manifest
index 9d335eac6ef5..455ba440af12 100644
--- a/net-misc/bopm/Manifest
+++ b/net-misc/bopm/Manifest
@@ -7,4 +7,4 @@ AUX bopm.init.d 450 BLAKE2B 22516346f9461d43c364115f04256090a8eef2e83dceb6432ce5
 AUX bopm.init.d-r2 435 BLAKE2B 824a52870c1724d1e6ce0b3bf319e5c7718d2591e87fb9b1115fe3a07b8ef5f4234d2d935b31701934ba7ab23b6340c068d6843227760fbbea00df4df8a260d9 SHA512 ba5dab8f556108a7e273788a8483443c250f8b8c24d17f522b795b8383d2f257babd9543921f038461f16c34e6103e526c63c8c5d2e00be80f5f8ab0fd8040d3
 DIST bopm-3.1.3.tar.gz 819273 BLAKE2B a0630ca3835467ae15622aa2ec5ee6174b57f43e7d22b1cd03884dcbc2e6d4967118e5c22f238b00a9495f76ec92537d0c4fb517ba7cf3e2c355cee366777804 SHA512 974c243e4fb7e184d3aa570dda2d919cea33df71215746d156b37b7fa3d6f45cd5448c847a7321d4ca22356fffa372f5486e6c3cd958698e173d79731f8ef8af
 EBUILD bopm-3.1.3-r4.ebuild 1383 BLAKE2B b1c515d5b44b1c0e2199551f40a0cc53ddd6281bb6cf89beb144813b8f7c7993743c76cc2e8ced03cf1d80dfa6a6088524c091b6dc256038c63537184a12d969 SHA512 2ce8f45a7538aeeab3cfb7e0c9561002a6a217002a388531e79ac0443a7efca1cdd9dd9856f6ae2c5956abefc445f1f56952fdaa026026c75941e8d7bc0f3489
-MISC metadata.xml 440 BLAKE2B e389117f1113e706d15117d8fb61f423b765b2d6c69c2fda129d450121d4dee1e92d0e5c5a560f703271aae30ae3f9af4661bb6668c6f10fc67d056bbb66dcdb SHA512 f55f7dd218a0d3998a847750bad43fc58e947c292f0c31f8a89b5d05bdd2accb8f132b734787f2b4c8802752561dca7ddac07dfea3eaf16a15116ece2301d797
+MISC metadata.xml 246 BLAKE2B a423f65b437e5f5da96a548b39655705d8a48e8404fe1c9b4922a97fc8e9fd89ac3107611b95657d2c496337cbe3a6ca5d3ce4b5b79d8ba35c356e8dee07d1d3 SHA512 0eb12cecf92914383c7ea1a3498961761c9d28b9c214ddbef36050790ff1288602302b2dbf5d5fffe24efde5268bcea8bfd2d49e4f261e6126d2b275f7bf3b80
diff --git a/net-misc/bopm/metadata.xml b/net-misc/bopm/metadata.xml
index 1da5439889b8..389984f4aa0b 100644
--- a/net-misc/bopm/metadata.xml
+++ b/net-misc/bopm/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>shentino@gmail.com</email>
-		<name>Shentino</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">blitzed-org/bopm</remote-id>
 	</upstream>
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index b90c50d58a32..0281df6959a1 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/freenet/Manifest b/net-p2p/freenet/Manifest
index 5f6963b94545..472f4fc7c86c 100644
--- a/net-p2p/freenet/Manifest
+++ b/net-p2p/freenet/Manifest
@@ -4,12 +4,12 @@ AUX freenet 474 BLAKE2B f50fbfaaaf6a919ac15b078a627eb1b2fbc9e6b6c83e4229ae4032e6
 AUX freenet-0.7.5_p1474-wrapper.conf 949 BLAKE2B 6832683015aff6db0ad2b4116a6b8aea2ca23c1ac38da72ae71ac3a339a2efe69a7bab37911035d82a15d6ff725fb8d481deae42bd1bbaf0ad62119194674354 SHA512 a6d30afc502176a6e0bab480368553c1df50add8fe18b65cede38be752c989125999cbb8bedfd68641623fd4498e19610c16d02fcf9d951da450a9612301cdeb
 AUX freenet.service 271 BLAKE2B 7d47ad525f4bb13e07c50a0bdf19f1ef234d5219e82f426254c316abc4517180c22267a245ca022edf68e615a2865fe0dd08f694ee5ee2ced8c5391b3c5e33ad SHA512 2f3d4ec0ba05eff328e8176cbe130176a82a1bb432599de44ab78ca27e9c96e0eafe0871f12b0165247f941a2e929635a6abe6cd61351b1305c0d0e8cff83d2b
 AUX run.sh-20090501 16217 BLAKE2B 249254104ca2d0a20131a5d6b36a07b14fe6407d1915d75ecf98a617de6e532def710975ff1b2e0b580f7148099cd7f6915d8adc0b15e1f67af4fc4713e0e5af SHA512 ba97f1e370ffb7c9ea109b7d529430581a588d8d7e121ec09865e9e8932f2901477f7f43e7d0b95c7c95c2c42db05870e5d811528f91f78b48b68a539c804e67
-DIST freenet-0.7.5_p1475.zip 5009537 BLAKE2B 48fe233c4da4b4a4d115986f827cbc4deb8e533afc217d3e0facb3765ab6b3e067e390847b05c3dbc9852693cdda2090fa957a0aaea75a4c71a583183c46c8d9 SHA512 96376600fb3ff6d2bd6ede426fd05c684b51a0f2ace1f83696b0f63b2e2acd9359d41558a11d954e54031e88a62afe854f6cab7d852756dff76851f075249369
 DIST freenet-0.7.5_p1478.zip 5082260 BLAKE2B 4f08b5eff361b0666647f67152fb9709d35ca6c5996a0ac1e899de16510d2f25afb89c8af150a4f9d0785da25ff5db2e80fc2e851e0c42c763b72952d456bde1 SHA512 4147ef68e9c61a7d90c378cd9a3896933c4b931c31caf95107d1e188b4bf51d187381200d262fc1adaf939be7b0ea0eec9f795a09c897c1d20765325ac5faf03
+DIST freenet-0.7.5_p1480.zip 5099654 BLAKE2B cdbe32e90f61f664c0aff8dea81a68a46ced7ba5aef3068243d99a1b189597dfc4126c6e83c0fd4de547d6d076939c601ed3d3f8ec4fa6d4a5dd5d6ef5322069 SHA512 8e6c11014554cba0591f5f98a6af22660643a2d62c46fb003ec16d1dd3643178300081bef78083d87608c012f232f46f71fdd201d031248bf28e91899f71547e
 DIST freenet-ant-1.7.1.jar 1327167 BLAKE2B 408ec04ef6be58490bc6be200bd2ae1946aa4e22a9e01c9ef00351316f7ec0e23b055ed0907c16eaf5a60d153d3b96e4c447884df752e13d16520b3360581895 SHA512 2c84378d995fed0630169fffab020bde89c3edb7b3bc1e14e2251ed71be684dc2520fdeed8bae382de362984e25a31dcd59326ef8735f8066166c1e8d98ca408
-DIST seednodes-20150812.fref.bz2 11631 BLAKE2B 0aac88c5553a3709393e2d290fcd4eea63ede1738e7ca77ccd4575b8aa0c9f2dcbaea4d149ffd93798374bbb807e0cb8fa5ab070d10a4d6f09a9a419b7c67414 SHA512 3aa2ef00ca058b313032243f03f0f82a4e70f455bbe3dee48f9ce438415711f4415172946a3f958e14a699df69d9d0fa88173ce482c0b3d503da0829418b1d3d
+DIST seednodes-0.7.5_p1480.zip 24935 BLAKE2B 2a297cb7e429a3db06882b703241d420fd7225192afd500f2ff5a3521b1a53c4d62fc2d5b4c0a6ed4d62fa3cd4da64a42da04459dea81701d98faf36b4642eb8 SHA512 cde40562156627818e3384cb8ca29ac02cc52eb9e02c3b0627d7786b4b7deace79b3a840f61c551a25f4d771190558fb277b3f63a71994c30c7b28a2c2f85497
 DIST seednodes-20160521.fref.bz2 13751 BLAKE2B f464eb99fcefd690867246b1a77175230ac1cc9e037f3dc465d56ad70d293df78f990cfd75e6be64c26d77f2bc7bfa0bbdedd9d1720a4afa658ed3c381139eb1 SHA512 3530ac6bf9de886930bb403c2d2ec27102d5dc6904582ee69987e369dbfaf7170aadbc02b95836ff43fef2531fb06087a494b426662cd5529c87316590fd2686
-EBUILD freenet-0.7.5_p1475-r2.ebuild 4298 BLAKE2B c0fe5de0fbffbb6ead79e94638d6f0e47104920da7109d5c292187a9f9c6e58a997c877169236df2fe34786df6a628283a0de77f4be4f4895a8cc5f4665345f1 SHA512 4710455e7f12a37f54b367b843f1758450a8e84a266771eb7288f183e347ecfc7424c8dfd0a40f3af0fd2cc0d27a53ebdf43553a7cc84eaeb4898190990d5233
 EBUILD freenet-0.7.5_p1478-r1.ebuild 4240 BLAKE2B b42422f22a2d862f259347306781b4023b7cb7add0b10294288eea3ca8a95b86e1a5d0d05a125c87530e1c06f943d7571aae9686d30a197e6845357623e4980c SHA512 3329c581704206df82e1a823947a4f64b6a3f347acc3908376e3055ba0bb684e64e70bf521788297def4918a759502e6220df3bfaa4e526dca837544903fad1a
 EBUILD freenet-0.7.5_p1478.ebuild 4240 BLAKE2B b42422f22a2d862f259347306781b4023b7cb7add0b10294288eea3ca8a95b86e1a5d0d05a125c87530e1c06f943d7571aae9686d30a197e6845357623e4980c SHA512 3329c581704206df82e1a823947a4f64b6a3f347acc3908376e3055ba0bb684e64e70bf521788297def4918a759502e6220df3bfaa4e526dca837544903fad1a
+EBUILD freenet-0.7.5_p1480.ebuild 4298 BLAKE2B 2f01470434fbc26103814728c6a0614227e1fd39a3a5fba273eec0970da749a08056e81805b2346280154adfa9cfe81891c3c6dea9e5734db14aa8cc25d73c9b SHA512 353064278dc061132a7d48037ae74fa53d129f40d79372e8f5cbf5ad4d91401d1d8062ea16d7710317a06988637efdfca4ad1b79c341b8a75a7a4ae1d790bd12
 MISC metadata.xml 333 BLAKE2B a43991a83e4f80ef55bf5e3858670d45bddfb5a1168a638124642260dc4c498430a6f5892a47d68af14fe3b63968d71561b92b1b31507d04770269d352843e21 SHA512 73b9b7fc476aba6342a92820a2a4d200735370173f10fd93521daa89c711d9152006dbb00aa1f513558cf0fb7e33ca97f7442ddce4a7bcc58c8a3ec8a08403c8
diff --git a/net-p2p/freenet/freenet-0.7.5_p1475-r2.ebuild b/net-p2p/freenet/freenet-0.7.5_p1480.ebuild
index 46fb1bb9cdc3..908e1b0cf928 100644
--- a/net-p2p/freenet/freenet-0.7.5_p1475-r2.ebuild
+++ b/net-p2p/freenet/freenet-0.7.5_p1480.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-DATE=20150812
+DATE=20160521
 JAVA_PKG_IUSE="doc source"
 
 inherit eutils java-pkg-2 java-ant-2 multilib systemd user
@@ -12,7 +12,7 @@ DESCRIPTION="An encrypted network without censorship"
 HOMEPAGE="https://freenetproject.org/"
 SRC_URI="
 	https://github.com/${PN}/fred/archive/build0${PV#*p}.zip -> ${P}.zip
-	mirror://gentoo/seednodes-${DATE}.fref.bz2
+	https://github.com/${PN}/seedrefs/archive/build0${PV#*p}.zip -> seednodes-${PV}.zip
 	mirror://gentoo/freenet-ant-1.7.1.jar"
 
 LICENSE="GPL-2+ GPL-2 MIT BSD-2 Apache-2.0"
@@ -63,7 +63,7 @@ RESTRICT="test" # they're broken in the last release.
 
 MY_PATCHES=(
 	"${FILESDIR}"/0.7.5_p1321-ext.patch
-	"${FILESDIR}/${PV}-remove-git.patch"
+	"${FILESDIR}/"0.7.5_p1475-remove-git.patch
 )
 
 pkg_setup() {
@@ -79,13 +79,11 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack ${P}.zip seednodes-${DATE}.fref.bz2
-
-	# See 603362.
-	# mv "${WORKDIR}"/freenet-fred-* "${S}" || die
+	unpack ${P}.zip seednodes-${PV}.zip
 }
 
 java_prepare() {
+	cat "${WORKDIR}"/seedrefs-build0${PV#*p}/* > "${S}"/seednodes.fref
 	cp "${FILESDIR}"/freenet-0.7.5_p1474-wrapper.conf freenet-wrapper.conf || die
 	cp "${FILESDIR}"/run.sh-20090501 run.sh || die
 
@@ -134,8 +132,7 @@ src_install() {
 	insinto /etc
 	doins freenet-wrapper.conf
 	insinto /var/freenet
-	doins run.sh
-	newins "${WORKDIR}"/seednodes-${DATE}.fref seednodes.fref
+	doins run.sh seednodes.fref
 	fperms +x /var/freenet/run.sh
 	dosym java-service-wrapper/libwrapper.so /usr/$(get_libdir)/libwrapper.so
 	use doc && java-pkg_dojavadoc javadoc
diff --git a/net-p2p/go-ipfs-bin/Manifest b/net-p2p/go-ipfs-bin/Manifest
index cb6dfa8f906d..9f0fc191d9c4 100644
--- a/net-p2p/go-ipfs-bin/Manifest
+++ b/net-p2p/go-ipfs-bin/Manifest
@@ -4,7 +4,8 @@ DIST go-ipfs_v0.4.12_linux-386.tar.gz 10093462 BLAKE2B 2cb0197f84badab6f21c505ac
 DIST go-ipfs_v0.4.12_linux-amd64.tar.gz 12640731 BLAKE2B 85468f3703c0b4b703642a7f7c1fc2282bfe4ce7541bda80d7ac0bf7facd23552354c72d7f96fb0c63fa04c1fae6c07eef617785464562b51828f47779eb0c4e SHA512 6fef8d9cb0660cb4ecb9cb0148a5a9ee69d2d5ddbf903961e8097d4c2e45af468885fa2060f378b9abf826da7e0cc0fa375639f25c11fe623ea43949907e06dd
 DIST go-ipfs_v0.4.13_linux-386.tar.gz 10092376 BLAKE2B 244d964402162d6de667e8c8b51a8a05f230916dc6048b5fd9b71b9776f26e775791eb80c3e02c7c6e730bf77fa6828cc7067e6070877e716d7e63439f481e36 SHA512 4d0c54e094a0566be8dec1dae5f99264dcf039d92a6f757b6e95b98b1d60f35d6a226a130b02ff2be74875f8d6e283e8535666a011b6c940b91f0fe0c03b8d24
 DIST go-ipfs_v0.4.13_linux-amd64.tar.gz 12635297 BLAKE2B 984dc455668fc9c5cd3b301978b0639f1c2dcb22e6091d351d6ff021aca427ae06801ab814eb497ce6b597f8fcdbcdd7f8764334220ae1dcacda4ce2d9a314ae SHA512 b1c8a8ed5f9857f421dd1dc082492a39dc517b6306184762b3161af0c81f22d9e17720a4a459e94f369a6c0664da37f0516b1cea07ca742d9dd4305537e416b2
+DIST go-ipfs_v0.4.13_linux-arm.tar.gz 9925178 BLAKE2B 735534b278838a9ea25a6d379ffa6834c2710c61901870924f60fd6849b6320271dc5af263e58140096f3dff1d0d50a8f1835364889cd4e1b3a16383ec2b5599 SHA512 2152c4d132ab753c50fc8c5f3726066d5f0d490db02f2dc344c2414cd3ea93daa88f75d38e92a33aa036fa49ac97e615320a690d7680f6a3c86604a6cd0f00cb
 EBUILD go-ipfs-bin-0.4.11.ebuild 654 BLAKE2B fa493a38a4ee96df8ce107ed0983b364a8f7dd187a88312c43376b280d5f5a77dfcacebc41b4f511f81bc40f1165a42b84bca3dde17b6326051a6de4bf0d115a SHA512 98ab288e3142f445de02e967608468c59979c9e437d52090059f0e08586aae5ab12ba178e999b67e56e71b4fd636f53c784925076f0916bdb04bdfa531cce650
 EBUILD go-ipfs-bin-0.4.12.ebuild 654 BLAKE2B fa493a38a4ee96df8ce107ed0983b364a8f7dd187a88312c43376b280d5f5a77dfcacebc41b4f511f81bc40f1165a42b84bca3dde17b6326051a6de4bf0d115a SHA512 98ab288e3142f445de02e967608468c59979c9e437d52090059f0e08586aae5ab12ba178e999b67e56e71b4fd636f53c784925076f0916bdb04bdfa531cce650
-EBUILD go-ipfs-bin-0.4.13.ebuild 654 BLAKE2B fa493a38a4ee96df8ce107ed0983b364a8f7dd187a88312c43376b280d5f5a77dfcacebc41b4f511f81bc40f1165a42b84bca3dde17b6326051a6de4bf0d115a SHA512 98ab288e3142f445de02e967608468c59979c9e437d52090059f0e08586aae5ab12ba178e999b67e56e71b4fd636f53c784925076f0916bdb04bdfa531cce650
+EBUILD go-ipfs-bin-0.4.13.ebuild 633 BLAKE2B 659a70b31522bd778aa31b41dd96226062b1dc9e05c8a5066450b7e2f43a5146255a161c52cbdac7e8d710899995da3b09930a2bf9434689355186f1c27f1010 SHA512 26d66ff0966654eb1259f97da7511725e64799e31a38a4b2c5b9cd984de974c3a2f596ee507d5666cb91f887f859b6ba9d63f09b8e7d8dab663042f139344904
 MISC metadata.xml 606 BLAKE2B a6db8a5d8f57434206cbe3a8d69a3734381fdc2f13c2dd17596f2dd69fce52deca63717920ef0ff8f861451465f4702f967dbe1790916898000c7eeb858604a3 SHA512 3c0ae2eeeb423edc50a5961f9e9f040b33c0a343e77b47dafc1699eea65708df2365944338da691a637ea79680976dfc91346e6572c42cae94a429c0902c8065
diff --git a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.13.ebuild b/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.13.ebuild
index 8e07ed6fc878..142d353d7e07 100644
--- a/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.13.ebuild
+++ b/net-p2p/go-ipfs-bin/go-ipfs-bin-0.4.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,13 +6,12 @@ EAPI=6
 DESCRIPTION="go-ipfs is the main implementation of IPFS."
 HOMEPAGE="https://ipfs.io/"
 SRC_URI="amd64? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-amd64.tar.gz )
-	x86? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-386.tar.gz )"
-# Also available arches:
-#	arm? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-arm.tar.gz )
+	x86? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-386.tar.gz )
+	arm? ( https://dist.ipfs.io/go-ipfs/v${PV}/go-ipfs_v${PV}_linux-arm.tar.gz )"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
+KEYWORDS="-* ~amd64 ~arm ~x86"
 IUSE="+fuse"
 
 RDEPEND="fuse? ( sys-fs/fuse )"
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index a14c4fc7cf36..eb69442cbd02 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/pnm2ppa/Manifest b/net-print/pnm2ppa/Manifest
index 0e62619bd61f..d9748218cefc 100644
--- a/net-print/pnm2ppa/Manifest
+++ b/net-print/pnm2ppa/Manifest
@@ -1,3 +1,3 @@
 DIST pnm2ppa-1.13.tar.gz 291190 BLAKE2B c348f5582e8014a8dcc349a6254a302ce3e8272984b96828b3ce9f012654fb2520624aed6db2a97c3f0cbaf2be608a0d83da2b5b2b799e7500f89a6927c6d0d6 SHA512 8f96792cf7f03fd024db9a8d338f06d7484fa4474c1cd73048c90f0e88ae5540df30e6894c0bbc82dfd87126fc72875b6d71b2031c0e24b343ef88f51d00bb7a
-EBUILD pnm2ppa-1.13-r1.ebuild 1566 BLAKE2B aee46922bf247123fa2e59d1fded1f3082453e0a6a54b614c2011634d0fc6d1c07286abfff7c67cf5598a0e7b0763894acfe7a003ac4a018ffe42882cd130e11 SHA512 0fd91ed5cfd9b98227532be31a147e767a8db4283214dcfc0641e312c51454f4ac4e4275e4a85c1dd2567cb53ed743fb4d5f44703348eaca38979dcc65184202
+EBUILD pnm2ppa-1.13-r1.ebuild 1560 BLAKE2B a6c9f88262f935335f4d8643d7772c6b95c0115145df0c883e8a75c9d174a06e4f19974f7705dfd6993d33ed8ae1799ec47a4805c07bd78bf61c2b0156c7aad8 SHA512 235607e89c4e77f2c795786af0a90287156a6a690ba4dea81d260d24cb967ed3743573e4c070f740656f6e79bd7591bfffbf78708af8c50849fbba4cf1ec9b59
 MISC metadata.xml 336 BLAKE2B 82376654bf2d655189b054c7e2168a59019ab7a5513fc7e4e306a5e8f9bb3eba86adfcb5fa4f1e112550d0123fa130446cb943e34b77b434f9278063caf0466d SHA512 345cc7f244621dee98b191a5b9704783490eccf9b27cda4c8d052657ebb35dc441ab752014a34f171115b26a9a2d8650c9cb2afc788e9271be6d91d47de3a507
diff --git a/net-print/pnm2ppa/pnm2ppa-1.13-r1.ebuild b/net-print/pnm2ppa/pnm2ppa-1.13-r1.ebuild
index 0e30bb154713..8756c6c1059e 100644
--- a/net-print/pnm2ppa/pnm2ppa-1.13-r1.ebuild
+++ b/net-print/pnm2ppa/pnm2ppa-1.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -17,7 +17,7 @@ IUSE="syslog"
 # en on first place so others can override it
 LANGS="en cs es fr it nl"
 for lng in ${LANGS}; do
-	IUSE+=" linguas_${lng}"
+	IUSE+=" l10n_${lng}"
 done
 
 RDEPEND="
@@ -33,7 +33,7 @@ src_configure() {
 	local lng i withval
 
 	for lng in ${LANGS}; do
-		if use linguas_${lng}; then
+		if use l10n_${lng}; then
 			if [[ -n ${i} ]] ; then
 				ewarn "This package supports only one translation at a time."
 				ewarn "Overriding previous value: \"${withval}\" with \"${lng}\""
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 09a63597de95..336cf58db0f8 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/desc/l10n.desc b/profiles/desc/l10n.desc
index b06ac668b0f4..4e4a062fbb47 100644
--- a/profiles/desc/l10n.desc
+++ b/profiles/desc/l10n.desc
@@ -43,7 +43,6 @@ ca-valencia - Catalan (Valencian)
 cak - Kaqchikel
 chr - Cherokee
 cs - Czech
-csb - Kashubian
 cy - Welsh
 da - Danish
 de - German
diff --git a/profiles/package.mask b/profiles/package.mask
index e91ea6ea8cf2..f642a1676b6f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,15 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (07 Jan 2018)
+# Masked for removal in 30 days, no more rdeps, bug #602816
+dev-python/python-poppler-qt4
+
+# Mikle Kolyada <zlogene@gentoo.org> (07 Jan 2018)
+# The package was suddenly forgotten during tuxonice-sources masking.
+# Mask for removal in 14 days as the sources package has already been removed.
+sys-apps/tuxonice-userui
+
 # Andreas Sturmlechner <asturm@gentoo.org> (05 Jan 2018)
 # Masked for removal in 30 days, merged into dev-util/kdevelop
 dev-util/kdevplatform
@@ -311,10 +320,6 @@ app-doc/linux-gazette-base
 app-doc/linux-gazette-all
 app-doc/linux-gazette
 
-# Andreas Sturmlechner <asturm@gentoo.org> (27 Dec 2017)
-# Masked because no more USE=qt4 breaks rdeps, bug #642444
->=app-text/poppler-0.62.0
-
 # David Seifert <soap@gentoo.org> (27 Dec 2017)
 # Last release in 2005, crashes on use, EAPI 3 (#640262).
 # Removal in 30 days
@@ -585,6 +590,13 @@ net-libs/polarssl
 
 # Andreas Sturmlechner <asturm@gentoo.org> (12 Dec 2017)
 # Depends on dead kdelibs4/qt4, unmaintained upstream. No port to
+# KF5 released. If you depend on this package, please help test the
+# KF5-based cirkuit-0.4.3_p201710115 snapshot.
+# Bug #640884. Masked for removal in 30 days.
+sci-electronics/cirkuit
+
+# Andreas Sturmlechner <asturm@gentoo.org> (12 Dec 2017)
+# Depends on dead kdelibs4/qt4, unmaintained upstream. No port to
 # KF5 released.
 # Possible alternatives are media-sound/cantata (an awesome mpd client),
 # media-sound/clementine and media-sound/tomahawk (the latter also declared
@@ -601,13 +613,6 @@ x11-libs/qtscriptgenerator
 media-sound/vdramgw
 
 # Andreas Sturmlechner <asturm@gentoo.org> (12 Dec 2017)
-# Depends on dead kdelibs4/qt4, unmaintained upstream. No port to
-# KF5 released. If you depend on this package, please help test KF5-based
-# cirkuit-9999 in KDE ebuild repository to decide on a possible snapshot.
-# Bug #640884. Masked for removal in 30 days.
-sci-electronics/cirkuit
-
-# Andreas Sturmlechner <asturm@gentoo.org> (12 Dec 2017)
 # Depends on dead kdelibs4/qt4, no port to KF5 released yet.
 # If you depend on this package, help test KF5-based simon-9999
 # to decide on a possible snapshot. Bugs #640846, 639960, 635816.
@@ -631,18 +636,8 @@ app-arch/defluff
 # Masked for removal in 30 days.
 media-radio/wspr
 
-# Michael Palimaka <kensington@gentoo.org> (07 Dec 2017)
-# Dead upstream. Requires dead Qt4.
-# Masked for removal in 30 days. Bug #640138.
-net-ftp/oneclickftp
-
-# Michael Palimaka <kensington@gentoo.org> (07 Dec 2017)
-# Dead upstream. Requires dead Qt4.
-# Masked for removal in 30 days. Bug #640138.
-dev-vcs/qct
-
 # Andreas Sturmlechner <asturm@gentoo.org> (03 Dec 2017)
-# Dead upstream, depending on dead qt3support/qt4. Bug #631788
+# Depends on dead Qt4, upstream porting inquiry pending. Bug #631788
 games-kids/crayon-physics
 
 # Alexey Shvetsov <alexxy@gentoo.org> (01 Dec 2017)
@@ -742,13 +737,6 @@ sys-devel/automake:1.8
 # See bug #634040
 <perl-core/Unicode-Collate-1.190.0-r99
 
-# Jonas Stein <jstein@gentoo.org> (10 Oct 2017)
-# Depends on the AIM service which will be discontinued on 2017-12-15.
-# See also bug #633914. Masked for removal on 2017-12-20
-net-im/pyaim-t
-net-im/pork
-net-im/reaim
-
 # Michał Górny <mgorny@gentoo.org> (05 Oct 2017)
 # (on behalf of QA)
 # Rogue version bumps that reintroduce QA violations that were fixed
diff --git a/profiles/use.desc b/profiles/use.desc
index 18dd1bb0e8ad..44beb587629d 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -183,10 +183,8 @@ libsamplerate - Build with support for converting sample rates using libsamplera
 libwww - Add libwww support (General purpose WEB API)
 linguas_af - Afrikaans locale
 linguas_af_ZA - Afrikaans locale for South Africa
-linguas_am - Amharic locale
 linguas_ar - Arabic locale
 linguas_ar_SA - Arabic locale for Saudi-Arabia
-linguas_ast - Asturian locale
 linguas_az - Azeri locale
 linguas_be - Belarusian locale
 linguas_be_BY - Belarusian locale
@@ -212,7 +210,6 @@ linguas_el - Greek locale
 linguas_el_GR - Greek locale
 linguas_en - English locale
 linguas_en_AU - English locale for Australia
-linguas_en_CA - English locale for Canada
 linguas_en_GB - English locale for Britain
 linguas_en_US - English locale for America
 linguas_eo - Esperanto locale
@@ -235,7 +232,6 @@ linguas_fa - Persian locale
 linguas_fa_IR - Persian locale for Iran
 linguas_fi - Finnish locale
 linguas_fi_FI - Finnish locale
-linguas_fo - Faroese locale
 linguas_fr - French locale
 linguas_fr_CA - French locale for Canada
 linguas_fr_FR - French locale for France
@@ -279,11 +275,9 @@ linguas_lv_LV - Latvian locale for Latvia
 linguas_me - Montenegrin (Crnogorski) locale
 linguas_mk - Macedonian locale
 linguas_mk_MK - Macedonian locale for Macedonia
-linguas_ml - Malayalam locale
 linguas_mn - Mongolian locale
 linguas_ms - Malay locale
 linguas_ms_MY - Malay locale for Malaysia
-linguas_nan - Min Nan locale
 linguas_nb - Norwegian (Bokmal) locale
 linguas_nb_NO - Norwegian (Bokmal) locale for Norway
 linguas_ne - Nepali locale
@@ -305,7 +299,6 @@ linguas_ro_RO - Romanian locale for Romania
 linguas_ru - Russian locale
 linguas_ru_RU - Russian locale for Russia
 linguas_sa - Sanskrit locale
-linguas_si - Sinhala locale
 linguas_sk - Slovak locale
 linguas_sk_SK - Slovak locale
 linguas_sl - Slovenian locale
@@ -325,7 +318,6 @@ linguas_th_TH - Thai locale Thailand
 linguas_tl - Tagalog locale
 linguas_tr - Turkish locale
 linguas_tr_TR - Turkish locale for Turkey
-linguas_ug - Uighur locale
 linguas_uk - Ukrainian locale
 linguas_uk_UA - Ukrainian locale for Ukraine
 linguas_ur - Urdu locale
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 2e2693348331..ae8e846b54b6 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3006,9 +3006,6 @@ dev-vcs/kdesvn:man - Build and install man pages
 dev-vcs/mercurial:bugzilla - Support bugzilla integration.
 dev-vcs/mercurial:gpg - Support signing with GnuPG.
 dev-vcs/mercurial:tk - Install dev-lang/tk for hgk script.
-dev-vcs/qct:bazaar - Support for dev-vcs/bzr
-dev-vcs/qct:mercurial - Support for dev-vcs/mercurial
-dev-vcs/qct:monotone - Support for dev-vcs/monotone
 dev-vcs/rabbitvcs:caja - Enable extension for mate-base/caja
 dev-vcs/rabbitvcs:cli - Eanble console based frontend
 dev-vcs/rabbitvcs:diff - Use for diff command dev-util/meld
@@ -3290,7 +3287,7 @@ games-strategy/heroes3:maps - Installs optional map data
 games-strategy/heroes3:music - Installs optional music data
 games-strategy/heroes3:sounds - Installs optional sound data
 games-strategy/ja2-stracciatella:editor - Adds necessary file to run the editor
-games-strategy/ja2-stracciatella:linguas_ru_gold - Support for russian gold ja2 version
+games-strategy/ja2-stracciatella:ru-gold - Support for russian gold ja2 version
 games-strategy/liquidwar6:doc - Convert the info pages to html
 games-strategy/liquidwar6:gles2 - Enable OpenGL ES 2.0 support
 games-strategy/liquidwar6:gtk - Used to display error/critical messages
@@ -5747,7 +5744,6 @@ net-im/psi:sql - Enable psi-new-history extras patch
 net-im/psi:webengine - Use dev-qt/qtwebengine instead of dev-qt/qtwebkit
 net-im/psi:webkit - Enable themed, html-based chatlogs
 net-im/psi:whiteboarding - Enable experimental interactive SVG drawing
-net-im/pyaim-t:webinterface - Install dependencies needed for the web interface
 net-im/pyicq-t:webinterface - Install dependencies needed for the web interface
 net-im/qtox:X - Adds support for X11
 net-im/qtox:gtk - Adds support for GTK and Status Notifier tray backends
@@ -7086,7 +7082,7 @@ sci-electronics/gtkwave:fatlines - Renders lines as double width in gtkwave.
 sci-electronics/gtkwave:judy - Enables Judy array support.
 sci-electronics/gtkwave:packed - Enables '#pragma pack' for data arrays (saves memory, costs time).
 sci-electronics/kicad:github - Add github support into PCB editor
-sci-electronics/kicad:i18n - Allow GUI internationalization through linguas_* use flags
+sci-electronics/kicad:i18n - Allow GUI internationalization through l10n_* use flags
 sci-electronics/kicad:minimal - Build only binaries without parts library and examples
 sci-electronics/kicad:python - Enable python scripting support
 sci-electronics/ngspice:shared - Build ngspice as a shared library
@@ -8346,6 +8342,7 @@ www-apps/wordpress:akismet - Installs Akismet comment spam plug-in
 www-apps/wordpress:themes - Installs themes (including default theme)
 www-client/chromium:component-build - Split build into more shared libraries to speed up linking. Mostly intended for debugging and development, NOT RECOMMENDED for general use.
 www-client/chromium:hangouts - Enable support for Google Hangouts features such as screen sharing
+www-client/chromium:jumbo-build - Combine source files to speed up build process.
 www-client/chromium:pic - Disable optimized assembly code that is not PIC friendly
 www-client/chromium:proprietary-codecs - Enable proprietary codecs like H.264, MP3
 www-client/chromium:suid - Build the SUID sandbox, which is only needed on CONFIG_USER_NS=n kernels
diff --git a/ros-meta/Manifest.gz b/ros-meta/Manifest.gz
index 08b583a17c5c..12b4f7bb3593 100644
--- a/ros-meta/Manifest.gz
+++ b/ros-meta/Manifest.gz
diff --git a/ros-meta/geometry_experimental/Manifest b/ros-meta/geometry_experimental/Manifest
index de71643e1b75..73ca942f3dec 100644
--- a/ros-meta/geometry_experimental/Manifest
+++ b/ros-meta/geometry_experimental/Manifest
@@ -1,10 +1,12 @@
 DIST geometry2-0.5.14.tar.gz 147162 BLAKE2B 9034e37e099e601323ad7bd7ca167a93dd40143efe2e9d202f61cf2740f02f537f3880df87d41ec377e09f9d31914c164a8fe0f94f3cdea23a7d1c4bd98098d5 SHA512 1e32dbfbd46a2d72dcc53cf67914bdc6bd1907cf8d9b6c24c5b73e9738a7068b1b974ea434a267f907f276bf70b85f7169d85679449402e0808edadb9fe21e82
 DIST geometry2-0.5.15.tar.gz 147275 BLAKE2B 27a520d7c76eeea551d95092ede446f2badaee72b72ff24936a2116a0fa824d3f83afa7b07c5d962824e163a4d470490a0d68a8026e9bf829e87d1008b88ddc3 SHA512 10a750948157904c0812aaae85e21eaf5c85dfef3770d418fd0c592a9179cef9fc2082ecc125be0fd0032e705dfb678d45930d3aa2cd0986a71c2e0a7307722c
 DIST geometry2-0.5.16.tar.gz 154351 BLAKE2B e630be09da6de544de0215d40ffcb0aa780be253320264d52603d5fe7506d12b27e986acb9c036973ba390c5cd96b5e838849ee2f5b1399148cf5cffb461cd76 SHA512 11909db98af78bbdef8d1a7dc5f20d3ff3cfcb0afc0e1d53b97a1ffe99aecea911f09364593eb232d7514a4caa192141404d892a33fc7ea9f5ce924ecf99fc51
+DIST geometry2-0.5.17.tar.gz 156516 BLAKE2B 72f936086fe3dbcfa3c05f7ae72e64f20fd1525513e79ed9c4dae7c5b097501ea230c483a3f1eb6e0ba6a342e0ddc5deacf05ec9f0c97b56df48dcf2bf669e8b SHA512 44d91796f03d0cbd8a9247568827dca4a848ec931fa754fd7815e9102f7bcac38e85ebcc27e3037827358dbfbc7d58b28775f00e1e04c48125e56c7b97cde925
 DIST geometry_experimental-0.5.13.tar.gz 134107 BLAKE2B eeeca3cd764775e6fc2ab73147b033a1bcb39a57a72516690772f40e7fca2d26d85e66cbf3a37a0a56d8be3e7239c1996344a40b94a82e2591bbc141e94c8fe4 SHA512 5b31a2ec2c8f852934c1c9a6aa0127c96b8f334f178742111c673195562a240649ac11ddde8d9738defae99184bdd83a57430fe6f17eb4cbd08ae600bfa7d43d
 EBUILD geometry_experimental-0.5.13.ebuild 565 BLAKE2B f8ffa44352fe08af7dd265ff1883c3589e12d46106644a1a00b905163a50502f0ef705eafd805d0eb87961cc0ea7d0f705aee12112ab17fb6c860fd67fe0220d SHA512 55e11015ecc58dd6a9f6bcf3214c7276a6e761b8e37c87e371011ff4f2fbb2ed7844e04b26f33577a3c72bff2eb71fa980eed1b69063e26051cb8fd264e281d4
 EBUILD geometry_experimental-0.5.14.ebuild 553 BLAKE2B d382df2a48fa0314771dad300d691ff30ee6df01a89ccb6e2d96cf43d2d8208ce288316e7d432da64c17fee4f48d49b9160f78fe819f95d436a7b584f2555d2e SHA512 1dfb5d5a075d3deba51b21f7c3f26c3f71106cbc01b4ee81c655e187ea99cb3779f32bf80229ffa0fd0bdb4001327c975a989f533b62c5759dcf12629bbe46db
 EBUILD geometry_experimental-0.5.15.ebuild 553 BLAKE2B d382df2a48fa0314771dad300d691ff30ee6df01a89ccb6e2d96cf43d2d8208ce288316e7d432da64c17fee4f48d49b9160f78fe819f95d436a7b584f2555d2e SHA512 1dfb5d5a075d3deba51b21f7c3f26c3f71106cbc01b4ee81c655e187ea99cb3779f32bf80229ffa0fd0bdb4001327c975a989f533b62c5759dcf12629bbe46db
 EBUILD geometry_experimental-0.5.16.ebuild 553 BLAKE2B d382df2a48fa0314771dad300d691ff30ee6df01a89ccb6e2d96cf43d2d8208ce288316e7d432da64c17fee4f48d49b9160f78fe819f95d436a7b584f2555d2e SHA512 1dfb5d5a075d3deba51b21f7c3f26c3f71106cbc01b4ee81c655e187ea99cb3779f32bf80229ffa0fd0bdb4001327c975a989f533b62c5759dcf12629bbe46db
+EBUILD geometry_experimental-0.5.17.ebuild 553 BLAKE2B a833d2917d2b101fb2780314fc94f13ae7b2868f02224b48de3ba4bbcdbc952f2c9807f9fb3914d2ab42584d6479f13dada6a9a06a3480c323af2174158b4f0b SHA512 d7349b359474da6932e0edd35c161589e68f371b1ded904746322659e50357f70c8490bfe07631bbf86feb874ca8213ac828ad765a7b6172a58c6b09c1046587
 EBUILD geometry_experimental-9999.ebuild 553 BLAKE2B d382df2a48fa0314771dad300d691ff30ee6df01a89ccb6e2d96cf43d2d8208ce288316e7d432da64c17fee4f48d49b9160f78fe819f95d436a7b584f2555d2e SHA512 1dfb5d5a075d3deba51b21f7c3f26c3f71106cbc01b4ee81c655e187ea99cb3779f32bf80229ffa0fd0bdb4001327c975a989f533b62c5759dcf12629bbe46db
 MISC metadata.xml 339 BLAKE2B bf7648aaefd8e1834d8d0faf1307566a068bffc3873942b6c799124486a369df38f2defae61afb67c51ed4750b77ee68ab163d1510b6ea0dedb3867bfa9a29e2 SHA512 70bde02b98edb10a9340db05de2bac26828bafd43be3fe2796a4cc8c115b409eac13c0eecd0ecb038f49f6eaa2bd6588671afff450fef02c0301356323216d51
diff --git a/ros-meta/geometry_experimental/geometry_experimental-0.5.17.ebuild b/ros-meta/geometry_experimental/geometry_experimental-0.5.17.ebuild
new file mode 100644
index 000000000000..ce3a95072a85
--- /dev/null
+++ b/ros-meta/geometry_experimental/geometry_experimental-0.5.17.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="The second generation Transform Library in ros"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/test_tf2
+	dev-ros/tf2
+	dev-ros/tf2_bullet
+	dev-ros/tf2_eigen
+	dev-ros/tf2_geometry_msgs
+	dev-ros/tf2_kdl
+	dev-ros/tf2_msgs
+	dev-ros/tf2_py
+	dev-ros/tf2_ros
+	dev-ros/tf2_sensor_msgs
+	dev-ros/tf2_tools
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/visualization_tutorials/Manifest b/ros-meta/visualization_tutorials/Manifest
index 504f907d6c9c..e36d2357190f 100644
--- a/ros-meta/visualization_tutorials/Manifest
+++ b/ros-meta/visualization_tutorials/Manifest
@@ -1,6 +1,8 @@
 DIST visualization_tutorials-0.10.1.tar.gz 428608 BLAKE2B abee44fa91388e792a5e2ccadf07a32236f7575f5a0e0121ddfdc0135bf63b12c8d603d4bee3ef463f0c64debf9e9c6f8c7c89c2e8dce8375d3264039b6378b0 SHA512 38ad2c29456ff994914b1ca3b2ab6d90b0c9224481d360fd7f88b38c0e9615d35eb94b90abb699738b5f4fac091489bdf2373168bc3a0acc0e6ba3a61b646bbf
+DIST visualization_tutorials-0.10.2.tar.gz 428684 BLAKE2B 751d18089c69cdb8cd0cfac97235d213cce9d098264dc49fcaf7d7a949216b8fd40041c23be5d16be1537298b876dc1854a8b7dc1214ba7aeb74b18716892636 SHA512 40d8621fd05e81dc23adbf7fd0a69209d796ade3ad291aa350030872a3bbffad2ec9ac0d31734ccf73f8215f7dd52834a35baaa3fe198a3fc4c5bda71a760b05
 DIST visualization_tutorials-0.9.2.tar.gz 428117 BLAKE2B f25320fa80b12a8a5499d505af369c33362e7f085de3846478b6376fc49e4e2502f07ded6c9e1025224d7b2418d78c87933b2d93b66ad2865eb45581384df24f SHA512 4a2b323e74725dbb77fbba6405d39246a89b170c66dec78288c4461d70c419efc3197eed5867f68305e490552d0480525153f98a64a3025efddc367db824ca53
 EBUILD visualization_tutorials-0.10.1.ebuild 558 BLAKE2B 1dff3ef90a7bce1ef51e7876b40d12c02a4f5edfa5b71d298c723a3c664de61243aa08b87c8db0a6524a08f499eb5a26ebb1d9dd0c8699ab303adbade741ee48 SHA512 f3ef663eccccbdd8eef9c5237ac63de43f69adadf828f9a8e370232b084a52d8ca300dd39d8f42158565ea1e241cbed7568b6207c7d684458b68f3eec0f5799a
+EBUILD visualization_tutorials-0.10.2.ebuild 558 BLAKE2B 80b04946918eb9ccbbb8a899e2ecf11ef9696d9a975af42994754db649d012063f3d58c24166f9b126d3bf6f89e894b6cfc50d445172f6885432fd8dcac87861 SHA512 9ab8351fb7628dca02ca0fe39b17afc98c62e6c8806bab8db6630ecc0606bdb3f3a1ee4d6bded029d3154c646af029a4c97c31679380467f98a594e97b6b1592
 EBUILD visualization_tutorials-0.9.2.ebuild 558 BLAKE2B 1dff3ef90a7bce1ef51e7876b40d12c02a4f5edfa5b71d298c723a3c664de61243aa08b87c8db0a6524a08f499eb5a26ebb1d9dd0c8699ab303adbade741ee48 SHA512 f3ef663eccccbdd8eef9c5237ac63de43f69adadf828f9a8e370232b084a52d8ca300dd39d8f42158565ea1e241cbed7568b6207c7d684458b68f3eec0f5799a
 EBUILD visualization_tutorials-9999.ebuild 558 BLAKE2B 1dff3ef90a7bce1ef51e7876b40d12c02a4f5edfa5b71d298c723a3c664de61243aa08b87c8db0a6524a08f499eb5a26ebb1d9dd0c8699ab303adbade741ee48 SHA512 f3ef663eccccbdd8eef9c5237ac63de43f69adadf828f9a8e370232b084a52d8ca300dd39d8f42158565ea1e241cbed7568b6207c7d684458b68f3eec0f5799a
 MISC metadata.xml 355 BLAKE2B fb6b9ee20af31ea0d99819722e6df9dc086b3b4de71d9a3aba80bee73490a62738ce308e9b1e77ee22c079e21ff7623b13fd7d46fd8d670232ea45a3cffd47ae SHA512 5e233967a9e4b9c0f790ddfa82d4c2febbb2948b3ed3abe4ec91d1ec0e80202738daed074eb911a63ccd6209837f5e52ab985ff4e792f3e90a38120963e8db34
diff --git a/ros-meta/visualization_tutorials/visualization_tutorials-0.10.2.ebuild b/ros-meta/visualization_tutorials/visualization_tutorials-0.10.2.ebuild
new file mode 100644
index 000000000000..72665544585b
--- /dev/null
+++ b/ros-meta/visualization_tutorials/visualization_tutorials-0.10.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Metapackage referencing tutorials related to rviz and visualization"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/interactive_marker_tutorials
+	dev-ros/librviz_tutorial
+	dev-ros/rviz_plugin_tutorials
+	dev-ros/rviz_python_tutorial
+	dev-ros/visualization_marker_tutorials
+"
+DEPEND="${RDEPEND}"
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index b74a2085df32..f5f722b530e4 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/cirkuit/Manifest b/sci-electronics/cirkuit/Manifest
index aae22522c5c6..7b037b8600e5 100644
--- a/sci-electronics/cirkuit/Manifest
+++ b/sci-electronics/cirkuit/Manifest
@@ -1,4 +1,3 @@
-AUX cirkuit-0.4.3-kdelibs-4.14.11.patch 437 BLAKE2B 8eb22ddf2a01a36709947aef5f1757c99aa247293247a2e04f479e8317b07c0998a73bac30654b37793794022b56567288253282f883940ebf3e9b672d26c374 SHA512 a0e6ffed6d410c8679abc95d385f80470609b11fab00c8fb155c4b9e39c0ba7a439437e812bedff52b5abe38e59e4c03c30ba2d0015ca860cfb07c1b4ba76599
-DIST cirkuit-0.4.3.tar.bz2 379628 BLAKE2B e68b7756738698354ff6256851049e3c9063ae5104841ba643fee822cd56e5a430fd83f65e73537f15c78015f51ee10163489d6955bda4dae701b873128dc3da SHA512 880033a7f52142d474840a4d095f89f37a2181f452712bde121646850fe3954f2851fd6dfdcfdfd2ce7b0b8d630522343678e6c5d1b67cddde73b24b86c9e6a5
-EBUILD cirkuit-0.4.3-r1.ebuild 867 BLAKE2B b22f5469082d2d8f8976e5e3fd97677291c4ba8c6ea37a29cfb3a236baee9c5f0022b0ec7e570293681706b6f5f1b2e40267d3a21c50e6407951d0bbe8b856c0 SHA512 5f4c073a5603624ca3491fc9dac4a6d2981047e711db12e7e8d8e1138beb1f6feb9b4c348a636bc729a7fd7a1ae88e30ae523a5969964046a5c67b0d1141fead
+DIST cirkuit-0.4.3_p201710115.tar.gz 459008 BLAKE2B 614b5e599f6b5f9f61e1dd95d821bc0331ec8233c5d1386d26010032e014f4cd873436e4a8690b897a29be5588b95a37a82aae6c0aca68785920a471910fe2de SHA512 41d2b8394952d551f1e03e005e3d6423f5cda0d623b8117bad35fe4d5ee4755f6fd5a689add825aba33d3a70a6af24f5dc257174e321a9e6745b04c6c2f215a2
+EBUILD cirkuit-0.4.3_p201710115.ebuild 1407 BLAKE2B f55baf44de3c7f65d283b61c23035e02237a3d7342fc1acb02ecf83858fcb0ccd41f51f3e164d8b1cabbc04e155b09da0229419ad1a77b6c327983b8b0b9d74e SHA512 3d29aa6f2e544e868b1fce4d0f17aa9350ac4fc86f0dedb13f7a1516f5480bdc988e44ff760c2776d94dad5774629e2670730450e452b98c8128e26da9df22b9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sci-electronics/cirkuit/cirkuit-0.4.3-r1.ebuild b/sci-electronics/cirkuit/cirkuit-0.4.3-r1.ebuild
deleted file mode 100644
index 137757a6fb5c..000000000000
--- a/sci-electronics/cirkuit/cirkuit-0.4.3-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KDE_MINIMAL="4.12.0"
-inherit kde4-base
-
-DESCRIPTION="An application to generate publication-ready figures"
-HOMEPAGE="http://wwwu.uni-klu.ac.at/magostin/cirkuit.html"
-SRC_URI="http://wwwu.uni-klu.ac.at/magostin/src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="
-	>=app-text/poppler-0.12.3-r3[qt4]
-"
-RDEPEND="${DEPEND}
-	app-text/ghostscript-gpl
-	app-text/ps2eps
-	dev-texlive/texlive-pstricks
-	media-gfx/dpic
-	media-gfx/pdf2svg
-	media-libs/netpbm
-	virtual/latex-base
-"
-
-DOCS=( Changelog README )
-PATCHES=( "${FILESDIR}/${P}-kdelibs-4.14.11.patch" )
-
-src_install() {
-	kde4-base_src_install
-
-	# bug 496694 - this file is part of >=kde-apps/katepart-4.12.0
-	rm "${D}"/usr/share/apps/katepart/syntax/gnuplot.xml || die
-}
diff --git a/sci-electronics/cirkuit/cirkuit-0.4.3_p201710115.ebuild b/sci-electronics/cirkuit/cirkuit-0.4.3_p201710115.ebuild
new file mode 100644
index 000000000000..f5d14824fdd3
--- /dev/null
+++ b/sci-electronics/cirkuit/cirkuit-0.4.3_p201710115.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=d9ff4c17d052c8d1bb648402e88d70d77897f847
+EGIT_BRANCH="frameworks"
+KDE_HANDBOOK="forceoptional"
+inherit kde5 vcs-snapshot
+
+DESCRIPTION="Application to generate publication-ready figures"
+HOMEPAGE="https://wwwu.uni-klu.ac.at/magostin/cirkuit.html"
+[[ ${KDE_BUILD_TYPE} = live ]] || \
+SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	app-text/poppler[qt5]
+"
+RDEPEND="${DEPEND}
+	app-text/ghostscript-gpl
+	app-text/ps2eps
+	dev-texlive/texlive-pstricks
+	media-gfx/dpic
+	media-gfx/pdf2svg
+	media-libs/netpbm
+	virtual/latex-base
+"
+
+DOCS=( Changelog README )
diff --git a/sci-electronics/cirkuit/files/cirkuit-0.4.3-kdelibs-4.14.11.patch b/sci-electronics/cirkuit/files/cirkuit-0.4.3-kdelibs-4.14.11.patch
deleted file mode 100644
index 9332701ea925..000000000000
--- a/sci-electronics/cirkuit/files/cirkuit-0.4.3-kdelibs-4.14.11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- po/CMakeLists.txt
-+++ po/CMakeLists.txt
-@@ -1,3 +1,9 @@
-+# The pofiles macro creates in some versions same name targets
-+# which since cmake 2.8 leads to target clashes.
-+# Hence force the old policy for all po directories.
-+# http://public.kitware.com/Bug/view.php?id=12952
-+cmake_policy(SET CMP0002 OLD)
-+
- find_package(Gettext REQUIRED)
- if (NOT GETTEXT_MSGMERGE_EXECUTABLE)
- MESSAGE(FATAL_ERROR "Please install msgmerge binary")
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index beeb8e4b3c19..2e1b33b4c2a5 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,7 +1,5 @@
 AUX qwt.patch 2136 BLAKE2B 3ab69581d1dac006ebd493c82bebee7df34fc00accf7957411a143ce1ba6fffebdffe3468ada7c1e51375cb55adca5d1b28c7a6d1708355d60508f85422e2494 SHA512 4a9edac8565bc7a77644d9b6adeec61187c34dcf72f309066eb6575de7baef5cb59668c70bf5b51fb22a8e5bad00da4d664d279b1d22aae5dbb8fe07f69ae91b
 AUX tinyxml6.patch 870 BLAKE2B 2edfb3b8f3a2ec715f429bb982c8f33179d713206bd427d10e4f9277fcc48712c8be2683f9d1ed54447dfde3d055a4fdd87e779bb58918ea78e19dedd3ce6109 SHA512 819b67127e97abe0dfd2b145f8d4e1aab1a11d7a8d734f085d82b3c4b814a37498e2f6b913e6c4a3a558c0420fc6f5de3dae508e76c6465352a3e6e45292eec6
-DIST gazebo-8.1.1.tar.bz2 52448136 BLAKE2B 39972762d2e5bbf81a02481d8b2f07bd6b3c6926670cf578cd26fce92060dbfa359a5d5362d6391ab051bd3f054da5a6af137a61179aeb7815a95ef4cf7329ce SHA512 bf5585e63cfb5a86b89a0e802c33ff07c5753e94b9282610d2ea1a4248af705a1c80ea52389b4a7c49f51ec1990e2c9a5e3a6a74fefebe1b20e70960ceb755e8
 DIST gazebo-8.2.0.tar.bz2 52513092 BLAKE2B d44c4ac837163331f50e266bb4880f42fff82037ccc9a7e1ac7ccea0a37415a2fc217c62b449358510308fc741e0c569e2613c70c328e323f6f018c5bc6f0b31 SHA512 d2561a6e5460ea068d9c84945e5955d986bc1f6f0d1ba16100aae53015c6e11da3a152ac6ecb906147d37261d4c680025bcc5f5587c6c09f127319dc184cf843
-EBUILD gazebo-8.1.1.ebuild 1835 BLAKE2B 6b0d5c4b30f86a8e381409140f6bfa1b500c8fb26685e10c309f18230e7aa8fd00d52d471cb33eb15a4af664b8d68174001a9b8330b749a514923b45d2408485 SHA512 f4656e7ed7fd4d0fbadb0a3cb0837149252d2c18b11cc3450dd950d5fb5eec4abd500682912bc70a16d31af727ba31f5d8c263cd37f3727b42e1a351c0c3b149
-EBUILD gazebo-8.2.0.ebuild 1870 BLAKE2B 5c1f2c703c85389ff2fdf94433112c1c659a09a50b61d1605512f1e3bc7fbfc6f4cc997f72c920a678469412257159475a28d35fc58e3c3be172d24ea4773b18 SHA512 b5fd31c98243d41aae94f75ed7ed037a25330a56481d316417330dfd7ec8501abe9258c80afbce28b449499b2e5e197e131d2c8189ad9202f2f2326143d6ac2d
+EBUILD gazebo-8.2.0-r1.ebuild 1871 BLAKE2B de6a0ab367d0e12fd886b64b2f88467d19b923c7d86399baf1254ae61875399ed08d733cf6b4ca9cdcb5f7971f3fb7bf44d253f72c823972d40e5fa10bc58127 SHA512 83bb680ebeb1f08fa09c9192acbf5ad744bc37fd4782f3d2387bfbaee50bc202eb891a0a7798d0255fc77cc1b137913b5ceba21fa0ed41cc07cf2bd910c10000
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/sci-electronics/gazebo/gazebo-8.1.1.ebuild b/sci-electronics/gazebo/gazebo-8.1.1.ebuild
deleted file mode 100644
index 72cc1dca1b33..000000000000
--- a/sci-electronics/gazebo/gazebo-8.1.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils versionator vcs-snapshot flag-o-matic
-
-DESCRIPTION="A 3D multiple robot simulator with dynamics"
-HOMEPAGE="http://gazebosim.org/"
-SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-# Subslot = major version = soname of libs
-SLOT="0/8"
-KEYWORDS="~amd64"
-IUSE="cpu_flags_x86_sse2 libav test"
-
-RDEPEND="
-	>=dev-libs/protobuf-2:=
-	virtual/opengl
-	media-libs/openal
-	net-misc/curl
-	dev-libs/tinyxml
-	dev-libs/tinyxml2:=
-	dev-libs/libtar
-	dev-cpp/tbb
-	>=dev-games/ogre-1.7.4[freeimage]
-	>=media-libs/freeimage-3.15.4[png]
-	sci-libs/libccd
-	libav? ( >=media-video/libav-9:0= )
-	!libav? ( >=media-video/ffmpeg-2.6:0= )
-	sci-libs/gts
-	>=sci-physics/bullet-2.82
-	>=dev-libs/sdformat-5.0:=
-	dev-qt/qtwidgets:5
-	dev-qt/qtcore:5
-	dev-qt/qtopengl:5
-	dev-libs/boost:=[threads]
-	sci-libs/gdal
-	virtual/libusb:1
-	dev-libs/libspnav
-	media-libs/freeimage
-	sci-libs/hdf5:=[cxx]
-	sys-apps/util-linux
-	media-gfx/graphviz
-	net-libs/ignition-msgs:=
-	>=sci-libs/ignition-math-2.3:3=
-	net-libs/ignition-transport:3=
-	x11-libs/qwt:6=[qt5]
-"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-	app-text/ronn
-	app-arch/gzip
-	virtual/pkgconfig
-	x11-apps/mesa-progs
-	test? ( dev-libs/libxslt )
-"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/qwt.patch" )
-
-src_configure() {
-	# doesnt build without it
-	append-cxxflags "-std=c++11"
-	# doesnt build with as-needed either
-	append-ldflags "-Wl,--no-as-needed"
-
-	local mycmakeargs=(
-		"-DUSE_UPSTREAM_CFLAGS=OFF"
-		"-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
-		"-DUSE_HOST_CFLAGS=FALSE"
-		"-DBUILD_TESTING=$(usex test TRUE FALSE)"
-		"-DENABLE_SCREEN_TESTS=FALSE"
-		"-DUSE_EXTERNAL_TINYXML2=TRUE"
-	)
-	cmake-utils_src_configure
-}
diff --git a/sci-electronics/gazebo/gazebo-8.2.0.ebuild b/sci-electronics/gazebo/gazebo-8.2.0-r1.ebuild
index 04696aa2fb5f..2c1546415b0b 100644
--- a/sci-electronics/gazebo/gazebo-8.2.0.ebuild
+++ b/sci-electronics/gazebo/gazebo-8.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -43,7 +43,7 @@ RDEPEND="
 	sci-libs/hdf5:=[cxx]
 	sys-apps/util-linux
 	media-gfx/graphviz
-	net-libs/ignition-msgs:=
+	net-libs/ignition-msgs:0=
 	>=sci-libs/ignition-math-2.3:3=
 	net-libs/ignition-transport:3=
 	x11-libs/qwt:6=[qt5]
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index eca97276e726..e5061bcf892d 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -22,4 +22,4 @@ EBUILD kicad-4.0.4.ebuild 7381 BLAKE2B a0368f595f54dcaf15d4053be3be8cfdbba40b472
 EBUILD kicad-4.0.5-r1.ebuild 6699 BLAKE2B 485bb6f15445c0873509fa6ad0840d243d0b28da578b96fd85f49edd6ac50d6962774248057c8ae268e6fd39ef5b7bf929bb14acd9a149fab6d5f60daf0ac8b8 SHA512 f5636852943e2d65d4121395a6fb97fa49a71b6947c8d5d3a66f322c46962aeab06c41aac4770af01eaa98142698843ddf6ca14f8681994a774112b6bdf68b8e
 EBUILD kicad-4.0.6.ebuild 6699 BLAKE2B 485bb6f15445c0873509fa6ad0840d243d0b28da578b96fd85f49edd6ac50d6962774248057c8ae268e6fd39ef5b7bf929bb14acd9a149fab6d5f60daf0ac8b8 SHA512 f5636852943e2d65d4121395a6fb97fa49a71b6947c8d5d3a66f322c46962aeab06c41aac4770af01eaa98142698843ddf6ca14f8681994a774112b6bdf68b8e
 EBUILD kicad-4.0.7.ebuild 6597 BLAKE2B 6a3450183c5ee0ad9b816dba08c481f1ca92c5cf7b49678b6e3c00d2bd4bd05c281dbd1958ae5258d5da74187d54cb6a90981440aeacd8f05e3392d0eabc4d94 SHA512 1f7caf432182884cd360874602c1582809ac00ca6b1fe55c6145a7f5079a291c40a0b5a025f62d604429708f87a65e41fe2765be732290fe46a4ae1c870496df
-MISC metadata.xml 1043 BLAKE2B f49c1e38b9347ec5559a9f0f0289ade163cafc95c5d5da59f8141a348a6b23502f58047400e621d39d66e2dd9715c2f78c1388c978e66daefa3ebaf34b214bda SHA512 3c0b70f293dce39d3866a2b18db93248560c07870f46cb36695541479b392340c26bfcb83e9b494b34a5f2b8c0bb7a91fd187c84fea7fe31d2aef3474261bdb7
+MISC metadata.xml 1040 BLAKE2B 74362acd9b0e66262f8519f6267def4776ea3a10897629548ead8964e2ec663e7956bc1d903eee1de8e845f13a71ee1f1751cd66a83e4c37e94a0d7e28a25fc5 SHA512 9dbc34cd28d5f9a32df8af460d5566c68cee85d951d2621a3ba73ef4b8884a035ab260a9f0e51037549e93a471fd52d232a262303de5e5f11a5db50859284f82
diff --git a/sci-electronics/kicad/metadata.xml b/sci-electronics/kicad/metadata.xml
index 07f6d7753d0a..c52f6fa76b53 100644
--- a/sci-electronics/kicad/metadata.xml
+++ b/sci-electronics/kicad/metadata.xml
@@ -12,7 +12,7 @@
 	</maintainer>
 	<use>
 		<flag name="github">Add github support into PCB editor</flag>
-		<flag name="i18n">Allow GUI internationalization through linguas_* use flags</flag>
+		<flag name="i18n">Allow GUI internationalization through l10n_* use flags</flag>
 		<flag name="minimal">Build only binaries without parts library and examples</flag>
 		<flag name="python">Enable python scripting support</flag>
 	</use>
diff --git a/sci-electronics/splat/Manifest b/sci-electronics/splat/Manifest
index d1c0ed40e529..092bdbb3343c 100644
--- a/sci-electronics/splat/Manifest
+++ b/sci-electronics/splat/Manifest
@@ -1,4 +1,4 @@
 AUX splat-1.2.2-gcc43.patch 205 BLAKE2B f145e08d07cf755914700690737f6ebc4230c598083495d1abe99586fa4302fd5e361c5277fe3daf494686e2ea551941f4a32c953f2f4c407474f2ba2ebac357 SHA512 ce99a5688305cc0bc53544b8c57cd73d3a9ccaaa7bce1115f63ee79c93c06f9ec80d694fcedcbded35b1f12d9b8b1d79022de7afb7fa43980710c4928c6dcf21
 DIST splat-1.4.2.tar.bz2 356823 BLAKE2B 7e4fe835128ae88b6d44d87159a5eab8652eed26876a637e613f57177ebfca8df7433455b53124318a2a0277bd09ca2cb9ce74ab205f5c6d1417fa736934b3fa SHA512 223b6184b1df35052709ba3b0e8679b9f6a2933c98ac433b0f07cd93b07213f55399a6eeb8e955a86fb59d13e09d891fc085ac17594f561268da239c30e885bb
-EBUILD splat-1.4.2.ebuild 2414 BLAKE2B d697148464bc41aac356d6e69a0822df98d0ed27f70301ac91128e3b5a0ec66167821336dd966e329f3ed39edce6696223f87f51a506613d6b41a0c8d439466f SHA512 bafe886cb2e73542bf76bcd817c95dc2a41dc50625444575dd79467457bbe6a838e282179ac15678542a71af0daae19499f6e5f4810de3e33214b1808ad253a6
+EBUILD splat-1.4.2.ebuild 2408 BLAKE2B 9526798d8ffc9bb9f3e76de2f5bbf822bfcede2dfea9c2f2b063acf7aece7ecde4cc9cf58e83caaa6dc6c09f3a82f49a09bfc87af612885c4219a9c8c789f158 SHA512 c665a8601bbaab1445f03fc5dcb207aeaf83d8eea9ecd8cd476e963b0afd9b43b0652f578f60341de2664fa289cb8e2150cc40c31e9a7744919f85b625a3ad4e
 MISC metadata.xml 740 BLAKE2B 20f01ab6e9fb164deaf70b2e0442a3d5c0df7131197da4e9a07c9928f14124e2d803a7779ddbd43d2d714ee57b48086ddd04c86bbe1dd4e565395f9eeede9a29 SHA512 7aae74c935e1a47b38e5bcbc08348e954625c5eb21fee593ab5d2662bcc2724f40ca4c62bc58145c9856b1a4167f23ce4b27c930f43eea4089f0edddcb1e82ee
diff --git a/sci-electronics/splat/splat-1.4.2.ebuild b/sci-electronics/splat/splat-1.4.2.ebuild
index c8fcbfc109f9..9514bcfdaf4d 100644
--- a/sci-electronics/splat/splat-1.4.2.ebuild
+++ b/sci-electronics/splat/splat-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.qsl.net/kd2bd/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc hires linguas_es"
+IUSE="doc hires l10n_es"
 
 DEPEND="sys-libs/zlib
 	app-arch/bzip2"
@@ -61,7 +61,7 @@ src_compile() {
 
 src_install() {
 	local SPLAT_LANG="english"
-	use linguas_es && SPLAT_LANG="spanish"
+	use l10n_es && SPLAT_LANG="spanish"
 	# splat binary
 	dobin rfsplat
 	if use hires; then
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index a54561eecbdb..825859f687a2 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index 942e30f0f73d..86e198753fa3 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,4 +1,5 @@
 DIST viking-1.6.2.tar.bz2 3324897 BLAKE2B ef3ab1d60d6cdca514776aaf59d01dedd063c8850ad842d7cbd23c321304b51ccceaa9e5c4f702afc56819e557b28a7ca2b3242ae2fa207e172f7cfdfbba0c45 SHA512 91f82aa1c0a7ab80990d501767ff0bf74c1d6153162e6213fc712e6a27fb465f89adf002e389a39fc51033f36f1b2ec5f05d20af328e5342dfc1158b8a9964f8
 DIST viking.pdf 383200 BLAKE2B 388129023e62008de2d2c402a72aa1e4a1834f99e6666bb9deedb5f5c32e8b94edeadf5a40e7b1f941aacc0057d4dcfbaf13c3098eb4efa02e3a1a8e00288201 SHA512 481c88afd43783475366d41cd46a7fa5fdbcd20fec27b3ce286fb8abe1e9efbb4164def0d19fca2380fa95b5b97e9472f25ff5e10f8d95261e85b7c4a52d29ee
+EBUILD viking-1.6.2-r1.ebuild 1737 BLAKE2B 7ebeff16a268c416f2ad3483444810f631f75b94a8b01b610a70e38bfb3c5ce0eecd582fd3aaf263ec465807f4218f084d87d54a660df82ce5c323a75f49d66f SHA512 ca42b943d2ca07bb0445ec94f30962c582c457dcf75480833d43d563a4b3566bd16350bf6d3d8aed6b2688f8deebd0585fc1c8670e8d2a2c4430ca17f6cc40a9
 EBUILD viking-1.6.2.ebuild 1583 BLAKE2B 42a03bc5d7713ebf48f7c5ffcac88684aafc4d3a635adc7eefaad021bb36fc317d182604f8516b5a77f54b66a9ce3936f1ec9d90a18df27be4b10522756e6b77 SHA512 7b64f44743726d3b34d9f3f90c7c02f2d12ececabf2973456d819af5190714538aaf8fd0dd2c1c2e4f5329f7edc46da5389b9b2965a9012900c6b144f1eaafc8
 MISC metadata.xml 828 BLAKE2B 4ca303eae02e593e48080b7fbd77fbaeff6b617b221621509932b0ef209d64ca356c9aca9504867508f3e857e587ed5db61ed97d12c49dfafe458bbfe66ec567 SHA512 c8b9fe12169e2ea31110188f2bb0aba17138dd325af8ad04d26803bed10ec63657a2de7fcc0ccb774b2731a1a85cf3bdad14c88796e6747ecbe5abb72d88e057
diff --git a/sci-geosciences/viking/viking-1.6.2-r1.ebuild b/sci-geosciences/viking/viking-1.6.2-r1.ebuild
new file mode 100644
index 000000000000..3fec473d5bf5
--- /dev/null
+++ b/sci-geosciences/viking/viking-1.6.2-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="GPS data editor and analyzer"
+HOMEPAGE="https://sourceforge.net/projects/viking/"
+IUSE="doc +exif libexif gps +magic mapnik nls sqlite"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.bz2
+	doc? ( mirror://sourceforge/${PN}/${PN}.pdf )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+COMMONDEPEND="
+	app-arch/bzip2
+	dev-libs/expat
+	dev-libs/glib:2
+	net-misc/curl
+	sys-libs/zlib
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	gps? ( >=sci-geosciences/gpsd-2.96 )
+	exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) )
+	magic? ( sys-apps/file )
+	mapnik? ( sci-geosciences/mapnik )
+	sqlite? ( dev-db/sqlite:3 )
+"
+RDEPEND="${COMMONDEPEND}
+	sci-geosciences/gpsbabel
+"
+DEPEND="${COMMONDEPEND}
+	app-text/gnome-doc-utils
+	dev-util/intltool
+	dev-util/gtk-doc-am
+	app-text/rarian
+	dev-libs/libxslt
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+src_configure() {
+	econf \
+		--disable-deprecations \
+		--with-libcurl \
+		--with-expat \
+		--enable-google \
+		--enable-terraserver \
+		--enable-expedia \
+		--enable-openstreetmap \
+		--enable-bluemarble \
+		--enable-geonames \
+		--enable-geocaches \
+		--disable-dem24k \
+		$(use_enable exif geotag) \
+		$(use_with libexif ) \
+		$(use_enable gps realtime-gps-tracking) \
+		$(use_enable magic) \
+		$(use_enable mapnik) \
+		$(use_enable nls) \
+		$(use_enable sqlite mbtiles )
+}
+
+src_install() {
+	default
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins "${DISTDIR}"/${PN}.pdf
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 5f957f9d0ee6..752242ce63c1 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/ignition-math/Manifest b/sci-libs/ignition-math/Manifest
index afd661bb4bff..e8ac85af1e4c 100644
--- a/sci-libs/ignition-math/Manifest
+++ b/sci-libs/ignition-math/Manifest
@@ -1,3 +1,5 @@
 DIST ignition-math3_3.2.0.tar.bz2 382201 BLAKE2B 79d0450356d931e3150afddd8f0d558923c6a27be4a56566ba18c6dc654b61b32acb92eff2ce5a87228bd512058e4b68d85b26bbbf1ac6a6c6af617b5ebcf59e SHA512 ffb5d61105ba0951c6420c53d64b47bdd65bdcac17e8ef2ce7cb83aeb2310280e5acb4d029d1af5c05fb5c40accf05df61d1e04dc990225159f1749284e3dcf1
+DIST ignition-math4_4.0.0.tar.bz2 387717 BLAKE2B 1b19bcd377eb18b616a300e022419ba2651795e04c0f0a3769f565e6febdc1a37f321c81730e1c13c9f9b17f35e6cf558d1129b278b2477ec8d5a5f46b927d66 SHA512 4815c6222945fd228b2d23c9da7ad8876f8ba1fea382312e1eb320819ec5d8bbf637095c18dbe2413184bbea77040bd1a5492ea9427355fc5e62f6169277530e
 EBUILD ignition-math-3.2.0.ebuild 880 BLAKE2B b866fffaa38d0825997ac051a3be3ca79fb5e7b529b5abe344bd05d15e835eb2cb6212d1425d067461160ae85be4cedc7b370761447c52d758ce951bc4d9f4ef SHA512 8c5e7eb0bba7b5c928dd42169a7ffcc594ef338314dfa81373b6ffe3e5d836d944627ae68c342ca01b630c6badb1e094cb680e449fb5d68f160fb9b93bf96a88
+EBUILD ignition-math-4.0.0.ebuild 585 BLAKE2B 37def6107b2b72929d9b2f4306e4a7bb3c5844eade668ccef8878c96ae0efb1b83b91ad9a215ca4243e4d2235c2a815b06bc92ae775272bf89cd6d0633e51fad SHA512 23cfb27f6f8bfc659ffd0d82b9eb10927f6f50229857d8a2f23c85af49669f223a398c9527c5d6fc6cd73435b72ab1f6ea3c98b7a1c642482013644537f17645
 MISC metadata.xml 342 BLAKE2B 6b306ac4d7ec4a09c238f7b8c048589b7937b8a1e1e0573658ece2217054cb8a47da6e77d75439472dce378a4f4b1390ce8517352aa486db323a594f2a576131 SHA512 8969e6c2df55cfae7cc21640498871d7049499d146d06b13057701e742e9ef6f2c5124acd144b9e7f0974ea39032e89402252e32192242697555c64d90eb4b4a
diff --git a/sci-libs/ignition-math/ignition-math-4.0.0.ebuild b/sci-libs/ignition-math/ignition-math-4.0.0.ebuild
new file mode 100644
index 000000000000..423c6ac865d2
--- /dev/null
+++ b/sci-libs/ignition-math/ignition-math-4.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-multilib vcs-snapshot flag-o-matic
+
+DESCRIPTION="A small, fast, and high performance math library for robot applications"
+HOMEPAGE="http://ignitionrobotics.org/libraries/math"
+SRC_URI="https://bitbucket.org/ignitionrobotics/ign-math/get/${PN}4_${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="4/4"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-util/ignition-cmake[${MULTILIB_USEDEP}]"
+S="${WORKDIR}/${PN}4_${PV}"
+CMAKE_BUILD_TYPE=RelWithDebInfo
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 9b7a6abe2027..d811bf0b458c 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/maxima/Manifest b/sci-mathematics/maxima/Manifest
index 8836dd8f036b..143c0afcfc5c 100644
--- a/sci-mathematics/maxima/Manifest
+++ b/sci-mathematics/maxima/Manifest
@@ -10,7 +10,7 @@ AUX wish-2.patch 662 BLAKE2B ccc3879c7445fd916c921857ea9642fb54cc6b8eb647cb23c3f
 AUX xdg-utils-0.patch 1090 BLAKE2B 7a342a9e0bfd5b3aae1e3f8c45046c4fcaffea277cb68193e92fce4b23e03a0430ae095891183497e5deb969f1ba5e68f2423a9576c7465b137300bc2b096803 SHA512 31b121a2d6f1c24e5f2fa3e6129f661a891660665bf45a2907146e3bae9309d185f83d7001287df92a73aff81562a7011ad6b92e03516883bc0ae0730570fa38
 DIST maxima-5.38.1.tar.gz 38641257 BLAKE2B 0244b5dbdd337e64d4f7c3e7f6b946463b0246a9fd0660588798f7891fd1599cf400369fe0d1ce3433d01ce2e4b8bc86ad405d3f8368b429cd028362ec66a1b4 SHA512 abca10984dbb22a48bae481b2e803cb5bee6776e974b4bb9271773aa035fb5e49f34b2458aabca01f0a681a07179e57c012273be6f8d53c615b3309b1034abf9
 DIST maxima-5.41.0.tar.gz 41540226 BLAKE2B ff726044c9026bc58d04832fa6382146ed7e7d61d801fa7131b1e7e2ed386b99e238e039481697f9aa24cea59ffd0f6811675cd28818c9fe53f023f965f9d149 SHA512 1b93ae2db055ba7fb4a95924a896667f0cfa1c675c603c104181662aeb32b10b006158526b2f3ad93a59688a23eacdc82e870bb8ffb182a89e1e51de013ec209
-EBUILD maxima-5.38.1.ebuild 4821 BLAKE2B 276ef7be163424ac82e3829da51df4073616c4ec45fd1002589f0fe5e4f662e27db20729d188539f4cb4ca21d828c475bfb2db3cb6f5350935f6bca207d9be08 SHA512 3003b55bf303482d51462ab9b5332a6cb5e170b9780836666f9af5bd5d0838cca2fe57f26f5c955a5414594184bfd3c90064ee638f086074a40b66a7cf02cc22
+EBUILD maxima-5.38.1.ebuild 4823 BLAKE2B e2f4aa9b01a251b0ff0250df56a9b9cb904ea1d859ff32414fc38f48d9cd772ebe5bab5dbe02fdfe87f6c70c848ad9b2b0b724a8dcbd8aecf459d492cbfa6132 SHA512 88dfd3edcef7450247c1c62b1c9c8759a8816ff6ba6691074088253d5ae3922afa828b21e543978617cc022701a2dfc82e2d2436c21430da1249949393cf6e12
 EBUILD maxima-5.41.0-r1.ebuild 4890 BLAKE2B 5aa2a97dfd4dc72718a544c7de8a058d7a5ed102086b52e51906421cc69182df0252b336a7e4c2469cbe51fb761154088812edb764355859e3718eaa1b574783 SHA512 a2bfb607dfe6faa7098ae880ca4f3b7e3db808ecfa714611947df5d4fe00d7fdc6b9f7477ae9ccd3d83f25ae70c7eeffd0295105b5043ebbaeaa4c7f1bea8ee3
-EBUILD maxima-5.41.0.ebuild 4824 BLAKE2B 7e010f103f2a185ec286389ef7641344a36857e3247a55347e309e3321a4ca61328a3135738e704ea35ce946cde4a073a43175cf451900d00b7f69f926420d25 SHA512 cb5bd1095eeeab1a6a08da4f3dd7aaf6ffc7721efb6f8dda327b238a5e879c4f3fca898dd85e363a809cb90747b0f3a85dfcbe2de4311a371b4efd81f7e82335
+EBUILD maxima-5.41.0.ebuild 4826 BLAKE2B 2e0083e13d70aa1f946af706b480785a2dc4ed646ddfb22b06a5c9523e6d495130f0fe0682db6c9ffcfd1b199479db01a1010d91882d537115e7d62cdf7e9988 SHA512 dd5a2bf511a9018b6576e9ebff7ac98806d1b8ed02b0b8b1c3c21809060485290131339a02e0284b717163e23af745e36c0176891167e2e476a5fb1a7e5ec2a1
 MISC metadata.xml 1521 BLAKE2B 5b42a6b4f68699a032b2a1cc43a34b8b7a1050e41b1875f758eb8ffd82151825d3f920587cf89e25f4f692c8fc587e5b405ca8e2fb3e842b7d7ce61e068f0dc4 SHA512 d2db86fcab10cabb9533954838babc9cee4ebb26b99604ebe0cb995b1239ac2a462455cc72d6311dab142290fbf460eaec920138c09045003b46dd382ed8cbf3
diff --git a/sci-mathematics/maxima/maxima-5.38.1.ebuild b/sci-mathematics/maxima/maxima-5.38.1.ebuild
index af6a58ee4353..66c232a18d7a 100644
--- a/sci-mathematics/maxima/maxima-5.38.1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.38.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,7 +27,7 @@ IUSE="emacs tk nls unicode X ${LISPS[*]}"
 # Languages
 LANGS="de es pt pt_BR"
 for lang in ${LANGS}; do
-	IUSE="${IUSE} linguas_${lang}"
+	IUSE="${IUSE} l10n_${lang/_/-}"
 done
 
 # texlive-latexrecommended needed by imaxima for breqn.sty
@@ -131,7 +131,7 @@ src_configure() {
 	# enable existing translated doc
 	if use nls; then
 		for lang in ${LANGS}; do
-			if use "linguas_${lang}"; then
+			if use "l10n_${lang/_/-}"; then
 				CONFS="${CONFS} --enable-lang-${lang}"
 				use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
 			fi
diff --git a/sci-mathematics/maxima/maxima-5.41.0.ebuild b/sci-mathematics/maxima/maxima-5.41.0.ebuild
index 8bdc377e8486..cf8753a2f9e6 100644
--- a/sci-mathematics/maxima/maxima-5.41.0.ebuild
+++ b/sci-mathematics/maxima/maxima-5.41.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -27,7 +27,7 @@ IUSE="emacs tk nls unicode X ${LISPS[*]}"
 # Languages
 LANGS="de es pt pt_BR"
 for lang in ${LANGS}; do
-	IUSE="${IUSE} linguas_${lang}"
+	IUSE="${IUSE} l10n_${lang/_/-}"
 done
 
 # texlive-latexrecommended needed by imaxima for breqn.sty
@@ -131,7 +131,7 @@ src_configure() {
 	# enable existing translated doc
 	if use nls; then
 		for lang in ${LANGS}; do
-			if use "linguas_${lang}"; then
+			if use "l10n_${lang/_/-}"; then
 				CONFS="${CONFS} --enable-lang-${lang}"
 				use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
 			fi
diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 826ec57d9b4c..02c14a2104a8 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/lightspeed/Manifest b/sci-physics/lightspeed/Manifest
index ae349abce580..b2948476845e 100644
--- a/sci-physics/lightspeed/Manifest
+++ b/sci-physics/lightspeed/Manifest
@@ -3,6 +3,6 @@ AUX lightspeed-1.2a-libpng15.patch 579 BLAKE2B 72c8b721650366eacb6a2641b2937e2e7
 DIST lightspeed-1.2a.tar.gz 163764 BLAKE2B 0a5af8e85c1f45e330b8820c90306ea87b63547a7ea6480b33a58cd934d791f1ee2ab42895d751339bd0ee822a1f9957232c958a3e333c3adefd5c333a5da570 SHA512 d936e54fcf3f5a59b9d4f0ce7777755d8262a71634f9fca0f5f312a2fbf9f5b65d3fe6628d1547cf88ac8a02243712e838e7d84c5e61a6a318484545896b46ef
 DIST lightspeed_1.2a-7.diff.gz 379281 BLAKE2B 1cfae528d58b556cede1a2e8c3087f059ccaf1660ff8afca2c41acdc8cd3c676dc8f855b27ff7e795655620cef4af230e4893d02628b7d6b56c82e6d22744bc3 SHA512 f0a9999750470d45f9b7b6f3339fff5d75b461f8f937e16e784905e85a29fc5587b6b203f151f0a8075ea39b255f6d48c4ca78c48703f4ab3cd2d18af7a4df50
 DIST objects-1.tar.gz 767805 BLAKE2B cde889eae12913bd6c0f9f2c3206c49a2a946e8acef1080c19339dbad6bdd41a52abf108b052b0723cc43926395572eb9bc8ddc6548af06c6de9b5978a8d97b2 SHA512 cb8c2d5c323b92b87dfe2bfa8f7f37c46b381c4611d5ca2f645a16943339b90850615647f6edc21ae28a28792b0f071e8cac9779dbfdbf6bf928498cdd451231
-EBUILD lightspeed-1.2a-r1.ebuild 1594 BLAKE2B 52f6d499316b533a4072cedd8d31b210dcc1b189bacdcd428378109d520d1d7997fa1f4f6d2b407a9e0022d79dedf79ac1e1ea7a8d27dd0367f8991992cb0d9d SHA512 830bc2d5c1dbdba5b3371a27dd378190a5dcc3c353432c8345d53888d9371860648746acb1131ea0518251b54cd4e3ac3a817f3d592aef4569136712af3cf855
+EBUILD lightspeed-1.2a-r1.ebuild 1588 BLAKE2B 4840628cf40f3fb34a2086d00c9483b0d00c6b445522fb3f6494ea2504daccdea9bef77c50a0040e26b867134a6b5a758bd636ce4ee9a871a52a657a922c1221 SHA512 b9dd82e8c3b035c82bc0f5e835118d36de008a61985b27e4de010c0bab089f0f5c397290380f6d005057a897833081a52c27f9f2507f5f8053d8458bf4b3fc65
 EBUILD lightspeed-1.2a-r2.ebuild 1524 BLAKE2B 03ad31c3c0c436944882a4dc08a87b9e7a6ce924b61289cf6374811fb503821794aa08094611d0e668271097feb08fbfda9f8d5d58fb930f8f9fe5e9ef0e15a3 SHA512 7e69381fa323b8e0689b749f0f77e720d3034d6de81b91178e543d83cd0e92dd1bdbf13b7272546a4a557fb6673f7ab4e01c8d19f82da58b86dc15fe78e6f909
 MISC metadata.xml 763 BLAKE2B 896c0cda6875b7735977f4261e69e606bcfff6c384e7edddc28b01bb76e923c72dece79540ae5e60867f8954b0cf8c9ad3da4dee1200280c355add8650992422 SHA512 d33c67d677850f7eaf12b4086c66a49940259b5553470a9f3c9ca56279f06a99eec12384e75815e32e7953ac3275ce01e03582d35a9fa3de21e5b3380d02d08f
diff --git a/sci-physics/lightspeed/lightspeed-1.2a-r1.ebuild b/sci-physics/lightspeed/lightspeed-1.2a-r1.ebuild
index 947d85f9cfd7..93556901614f 100644
--- a/sci-physics/lightspeed/lightspeed-1.2a-r1.ebuild
+++ b/sci-physics/lightspeed/lightspeed-1.2a-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -20,7 +20,7 @@ KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="nls truetype"
 LANGS="es"
 for i in ${LANGS}; do
-	IUSE="${IUSE} linguas_${i}"
+	IUSE="${IUSE} l10n_${i}"
 done
 
 RDEPEND="
@@ -57,7 +57,7 @@ src_compile() {
 	emake
 	local i
 	for i in ${LANGS}; do
-		use linguas_${i} && emake ${i}.gmo
+		use l10n_${i} && emake ${i}.gmo
 	done
 }
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 6970812124e1..ffdf2e7bd161 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index b4f5e8fd972a..0ec097e75887 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -6,6 +6,6 @@ DIST hdparm-9.51.tar.gz 133725 BLAKE2B a507046d1026e901fb0feb9c61dac60d8bf8427f7
 DIST hdparm-9.52.tar.gz 140737 BLAKE2B 0614bfb0844f088b533951c4636bf92879c4ff7e9bb4d150965e936eaa2a4e0ffd350689fc359757a2f9e80a6c93cd111a25b8e2824737e01b4deb6e543b2868 SHA512 7c37d1381c1dd2d46762a8cdcaba2015b0b051ee7bd135dbcf6346def51b085cc2f9ecd7e1ebdc67e12ab4b765df548d4757b3700ed6e7514c2b13ed40661c59
 DIST hdparm-9.53.tar.gz 137009 BLAKE2B 934cec5d88033c14e7f2d182f2e1dc9f9dc63583208720fb748fd29b99cd54253fdcf7379443043787457c3fdabb83ddb55295f9f4abe0635ae2e4fd7e296bd1 SHA512 7d293d603c6bda5fa8ce389b69e6738c4ba920846a1f7443c89edd2f5085b056541afb1824921da4b38be43f992ee9a8cb7006bcc3156d3e5224823276c4d0c7
 EBUILD hdparm-9.51.ebuild 1068 BLAKE2B da518c793f37b34bed3ba283e7152d4fd4ebca37548090db5dac52c14141b513f47e16ae06c89e0dafbeaf92af76728d158c8c7539cad5f91f2c623f865e8dcb SHA512 af88b4d68dbb6c844b170a0313bb0ba98b6a0b2e36b3b2b6e45a5e6f6f6129f2a2aafb6b0fa63177b2af717cac5c0e322f3ed00f7ffe6a6c941dfa8145d3d7bb
-EBUILD hdparm-9.52.ebuild 1073 BLAKE2B 61796d398f727736721f0ba771af2c140423de8ab401718514f0723cc12dd8c8586e27517a8f0c2d3aa0d59273fccb0884522d5f91deea617860217d9ff97cbc SHA512 cd1962e2d766ab7239545d948cda3869d5b8efa386d5ca568f6e13cf45f18949cf5ad43a494d6591f0b50ce04377f2a259ec85b01b4fc85a6f6e1fb56d3f3f31
+EBUILD hdparm-9.52.ebuild 1072 BLAKE2B 919c0a810911bb21a73a66dbc72388d78610a2ab5293940291dc5816e96eb8b5e75a5ac8363e747357315107313df6feba9fc29779b1f1c8bccab2660ac2e30f SHA512 c1cf1b166617abdf129001a6e63d18f27525e2e53b21064818ce7b451f489bee1b5bd1fbb0686c44a08b8ceb1749565d4ca1e2e43912e485a3290c2ff8468fa4
 EBUILD hdparm-9.53.ebuild 1056 BLAKE2B 2bb3d67c186613200c7f17e6f13bfc058bf8c1d2c340e898ed687621a5e3f0e803f53a7d01f076551c96ad7b987453758bdda5d19fcb4aba1b541a53f5459c70 SHA512 d19fbe544788be2a9705938eddee7fe27178a9c282f75061c1fc20f11c7200a676b34586351c6b330258d71abef3c90d3c1f94251343a14c01e90adeb60bcf3c
 MISC metadata.xml 326 BLAKE2B 503d13af2b352e0b8d864559489f80ae98d7420c0a98ea46847126e792a93ffcbce3b524da7f6c3551702e07641cef62449c0c7f2ae6188d79df3f7e5a6b8685 SHA512 39219fcef0756910c51e804cf94170408208840e7b88d99b4583f8fcfb02e1664358f9d4bf4c3f1a1a619b6a87852bc4831c93f10215500842023132a85c2287
diff --git a/sys-apps/hdparm/hdparm-9.52.ebuild b/sys-apps/hdparm/hdparm-9.52.ebuild
index 4d9e49c9ba68..db7a255297d8 100644
--- a/sys-apps/hdparm/hdparm-9.52.ebuild
+++ b/sys-apps/hdparm/hdparm-9.52.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
 
 LICENSE="BSD GPL-2" # GPL-2 only
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static"
 
 PATCHES=(
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index aeb99e145c00..6a4c183cc64f 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -3,7 +3,7 @@ AUX keyutils-1.5.10-makefile-fixup.patch 798 BLAKE2B 42dec4f0a6b8439a631e1dbe319
 AUX keyutils-1.5.5-makefile-fixup.patch 879 BLAKE2B a4c5fe84445c638e126dc017a2caf05e97803d83a21706cec4ca116982f2111d54acdcf76cff63684dd50bbe8cdd38fbde1b18b7c73f82a8d943a1558c3d377b SHA512 d3628be5cd759fd59e3fb07897db2f23615cc4b2b12d537438c4c186e5588d8d7c22438fdb26003be29ace4910db24a889d4e35550b74a91958a4fcb4bc654c0
 AUX keyutils-1.5.9-disable-tests.patch 1146 BLAKE2B 8f4206d5c46e735e51172cc470c52c0f1326d392c05fdb2c5a8885e79e3c9108336ffaff778b0953a274c161e0bde4a4f23048c5e12e220ad996b916711be638 SHA512 cae4f6457587328efba4d391726d8ca61a7d4a2ca0fbf2b8eb6ccfadce53240ad9cb44137dc178efe7cfa78bef48d6d84fffd7af07cee15a949f5c62eae493e2
 AUX keyutils-1.5.9-endian-check-1.patch 1254 BLAKE2B b4416a587c208f7e8926c205a0a565495e7508df5245466bcd8abc4f7a19214626da759d0321d7db1d51f2e4553383d5475749ea8f9f6d58ad8749762f56d6ad SHA512 95f05393186546ff3b28e14184c8da6d507085e687e6921470bcb433a925b56dfc7b806eaf63a552552d0cad3a73294614f990db583e3a6b89ff973ffad1dce6
-AUX keyutils-1.5.9-endian-check-2.patch 1130 BLAKE2B a5c764ff0ad41b8bd66808fcb9edf904481fe65ecd113c7603c711dce7dd390914bb44d085496659c1abc8b68c404b4ddfc5e80dee2492f7caa95c7e7c82f4ba SHA512 651981bd5732bb539139cd43a3f25838d5adc99bbed0d5227270572fa8f53524208a534f3fbfbb707b23ef319492dbf11b64633ce6681119c7698a2b9ef49b95
+AUX keyutils-1.5.9-endian-check-2.patch 1131 BLAKE2B a5fd6fd62dd94be2bb23b3b60cedd1b8d6d3b06bdd32fcbbdcbdbc08150484eb6122271f20432bad3fa8697e626676c329ba08bf23d4a31788949b0c2bf7aede SHA512 9604b79b1d85bb1c56f5ca261f7f72fe84176fff0a098ce2fa35bb0ab5b325a7613f3e37f5f27ff1e9269d5779d77715baa0bd74a0d4f0b7c9bb1aa27b84b214
 AUX keyutils-1.5.9-header-extern-c.patch 1154 BLAKE2B df4ecd72145c8634b2ea043e45e05ca95374234a0aa2babf0eaabfd429997c96099f6698d33104ad45cb9e90a83316a2db93b0f73b9138be7618591bc1b1e235 SHA512 f6e91c6eb9785ff8e661fc80ab275a3a35d87cfc73ab9cc45195734aaa5126e5ddc219dce8a78834869b67448a730265f2b72390f0b517dedf6c729bf22d828e
 DIST keyutils-1.5.10.tar.bz2 74190 BLAKE2B 8eeab02ef363b785152ac4576f1ce9792711f482e27c3ba71d906624ecc88ef4ce2ee909d7bc3a35b42b50e971c0bd0600cfdefa9a3db35b25553bfcbe7d2d13 SHA512 7f6f956c7e76cdc2aeb52e74fe670b20a5f9a5d9b543fd2ce971d80c48745f37d05235a42f0a8f152b1128a109c7d8bf07e751282a20d2d3f433a99a5308ae8d
 DIST keyutils-1.5.9.tar.bz2 74683 BLAKE2B 8d5133dcc4c1f40e634fcd6584f3e2e56a0fd4ff25ded41c5f94ef3193ef7240ff4a24ef1c5beba6ba835195605a77126bf77aace35a1b4acf025160a2082dcb SHA512 d4ee1dabb87844e18bfd8d094a5bc9ce792c96720b71e77961b6c36bb1addb9acea2a7004ddfba1d09b167af908368162312e5c3656b22a6266955bb57b887e2
diff --git a/sys-apps/keyutils/files/keyutils-1.5.9-endian-check-2.patch b/sys-apps/keyutils/files/keyutils-1.5.9-endian-check-2.patch
index a4558d8edfcb..bc96dae464b8 100644
--- a/sys-apps/keyutils/files/keyutils-1.5.9-endian-check-2.patch
+++ b/sys-apps/keyutils/files/keyutils-1.5.9-endian-check-2.patch
@@ -25,7 +25,7 @@ index f2463c57b40e..5ac23ffc04fb 100644
  
  endian=`file -L /proc/$$/exe`
 -if expr "$endian" : '.* MSB \+executable.*' >&/dev/null
-+if expr "$endian" : '.* MSB \+\(executable\|shared object).*' >&/dev/null
++if expr "$endian" : '.* MSB \+\(executable\|shared object\).*' >&/dev/null
  then
      endian=BE
 -elif expr "$endian" : '.* LSB \+executable.*' >&/dev/null
diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest
index 7e3fe0b11649..d76eee8a06ba 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -6,7 +6,7 @@ DIST mawk-1.3.4-20161120.tgz 461464 BLAKE2B 7481345b391198cc9ec47f6ad84f0f07e31c
 DIST mawk-1.3.4-20171017.tgz 460819 BLAKE2B 91cb4cd039ea7773b788db87389f8ec34914afc8b299fecfdd579fe89fc4e6d731bfdc9c06a2c6c3d75ab9e1022bf5dbe1c662962d6ccd8a8f6fe4f8589927ca SHA512 4ed6ca0ecca12e7409d3d364b72dc6a2b411c61bf53fe8aa0b0cac65a3bdb941921c0b81d94f34c8ac9f4922c8c7566d347b5e6b5c74518ae3a88904f9e20f27
 EBUILD mawk-1.3.4_p20150503.ebuild 825 BLAKE2B 1d5b1fb1ac43e06b019f86bdf8ca9fa2d4392e27fee2160e13b46c90ee567979d70442be3aea5d96f73497502238d919da684a6268d7918802f8d57aa7389db8 SHA512 7f7b0386ae02ee8bd6b2a3df4218f3dd732b22e9154b8bd37ed15afbeba2a145aa02161e64b8e2be78d4e6d9c2b58e3d4fa4c7d5b557f434c1cdf21e593bd749
 EBUILD mawk-1.3.4_p20160615.ebuild 870 BLAKE2B c25882ed451d83bfea7ca5dd731a6d532396c91f7a38236ae2b884cb5f504341a937da1dd4bb22805b6f94488414756a182bcd6e3e5eaa21ef74e8c90805e7f0 SHA512 5841a8486c4a59f16c1add9e9aceb89fc428b29a29359ce17e451dd46f66c0501b4260463f4b152e1403e391d86c30638edef328ee31ae9ec1b0b4aa0238afe8
-EBUILD mawk-1.3.4_p20161120.ebuild 876 BLAKE2B 4ba3886f7863b138916aaac05e5119760324d8454764086976ce6646aa3e9791db61dfef3aa7854cfcc58a9c2580b6def586a14d21818c5c911ca55e179d569b SHA512 2f6adadb92dc35ffe2deee4fc5418740fa4c721cd39c9501986eec11259d2050a8de91c2c375457be452d1d013f02199dd848e6a3b09732c9db86800089c333e
+EBUILD mawk-1.3.4_p20161120.ebuild 875 BLAKE2B 01638a2cfe4d444a8d0e17787db6f864693ef4d95e12306eb342a81966b61d1582747a2f9f4e27f9c9f0f8b5321fbd69e45039af3e684aa9fc632dc65d525f74 SHA512 dd783c806bcf1139e50bb7b3688261bf955ecf949ea66bfff3d3d1fb032e68b3e74f984a35adfd8846a4126988c7ffee9229a5831d2f1f1c6466a241734dcca5
 EBUILD mawk-1.3.4_p20171017-r1.ebuild 1037 BLAKE2B 9c36e6b12d6a7b1c6448ed423509032464388849efc66312b24c8e7ba3efc11d94c3f425077f949514609bfcabb10da2d849a1977c919d068350c8137c942d14 SHA512 550d5d3f9123d402ecf442a94c8ccd87959eb8669a490e766e16d7b93acb5d3d23562527c5aac727cec44f1d068b339016dd901ac192662f06da3803f7ecd6a6
 EBUILD mawk-1.3.4_p20171017.ebuild 883 BLAKE2B deb941193402b058ecf23a7523698416660b09cfefcda6a51b2f2f50aaa72ba5b9230459826d82f9066b4bc8766c72f2a55583e21705f848df0ffa4d966509a5 SHA512 e072d0a8bb7125965bd3e0edea01eff17ef53b17baaf117fa7f5cd910acebd4cbc57f6725a6ae0419cf2eb177fcd3b8f4cdf5c5f0e7bb4d86fdbe86f7b75c9de
 MISC metadata.xml 359 BLAKE2B 988733eff41a4556cdb4f8d66adbe2864f33f4245ab1ba3a1456cb3b189fd12138cec7666d2fc125d275865a028274aaf5a41396430721ac96b913dc2f667f94 SHA512 bb64e60075207240fabd037108c2885b934d0dc0a72bdcce4c8c138555b1ebb4de811745235ee11fde75559ddf55f9488b71f53aab7e92df61099cba5ec28d2f
diff --git a/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild b/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild
index b45844d5b5c7..953fb7c8d558 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/mawk/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="app-eselect/eselect-awk"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest
index 7ca8b4101e5f..a9c5a26d61a1 100644
--- a/sys-apps/watchdog/Manifest
+++ b/sys-apps/watchdog/Manifest
@@ -4,8 +4,6 @@ AUX watchdog-conf.d 158 BLAKE2B d998b3cd1788d60d5aeec2872f39f748f75fb9bb6e3ef643
 AUX watchdog-init.d 861 BLAKE2B 5fbda896379eb22d6beb50c7839f9c10c463cea5491b74472ce30108551c7095bbac1bfde6f5089d81426809808bcecdea03fc0e0c7dab942dd4136cc1809aeb SHA512 f1a84e90dd6f169a6e28f38b9f362e43256bba0b4266fead707578705a8f404d9f256022d94d24f1555847765a27e5a7017b5e1fa20a613fdb0a41d305638231
 AUX watchdog-init.d-r1 773 BLAKE2B 7d5bdf4e349f558f12e8250de5abf39278e3d7bfa5344225ce717cd3575573853f11feef8cdc3aa526280f717f9ae43bd42191789ddf81bb4beb32afc8f38bc5 SHA512 c07f0e3f026a86ecbcaa839c5711420fe00433a9ce84c3a7e3f4de4a1d90bc5ad6646561acaa1d1df2d1adb638dd6817497c4c538574ac894deb6c7451b2964a
 AUX watchdog.service 146 BLAKE2B 9a0a28cbc4509590c98850bf31355e991fd298e52a1fce0a7b6925554f24b80c76adf76bee20790e0d100c8372e4e35a3b0826d6192267f5addf7155d414cf4c SHA512 5eb489e72351db8a881d84fc15730a91ca2a108641031196ad5374aec5e01fa5b859872fa27c3382b4637482a5c8dab7efa61057f4663ae6c49c4ed01e9d8abd
-DIST watchdog-5.14.tar.gz 216384 BLAKE2B e27f6cb3595c54a2128d828434fcbde7a42be3a31a8c837153950f360146526a809d55dbe68fa248e2efcd7063a888f563eb36075d7334e5b7307fb02da67c29 SHA512 ccfaca7a68a47cff42dbeae047dfa691e1cfc23851f9ca0634ea6315ff55a13cdbb0020bde7df38b702c82c0535ad41f520617dd639037e171701a6b0f8991aa
 DIST watchdog-5.15.tar.gz 228132 BLAKE2B 040badcf66f048e2873c335a4dd1b5dad6716c61534322c0c92dad2238049555af40e92612a260507fddd4c284d7ccb5d362dc1660084fd0a7db2c522b1ea323 SHA512 a675cfadf3296d583b9163193297038fb19459daf7c6681289392d613e775e75b7afd42a3e01b136a955f25b2f45818033b56e10de9050075d7dc015535a6e75
-EBUILD watchdog-5.14.ebuild 869 BLAKE2B 0d159a185ac60a8f911547e42d13f594d9c54e54f0bd49b375b975c9321eeb6ef13e89f748dea0947a01e7d48d4783e11838ae26c856372aed4d06b627260cd5 SHA512 7223acbd16f44a78cab8af57d283453f1e72fe49bab38100a2f3dfdfcdc9cc02caf3c07f75b77b06bdae6d14cd7c31069709d1f4374dcb852fa059cd4e57089a
-EBUILD watchdog-5.15.ebuild 977 BLAKE2B b806fb1999854c30adf4b9c13aa02a25ee0a80180850b7b4797873dae42cc3c35fc20fcfe755e9a95c1fd5e98e36502f0702cc4c7cd2ba1dfbce5faacd516904 SHA512 cc865a662a5f19d4e1c4c5ade4a47f3561ae29088a8ea33a73fa71fe7b53dd52e37bd95f0604a1455693a4c91002ac7c667bd4ba397340445944dc212f7a620e
+EBUILD watchdog-5.15.ebuild 976 BLAKE2B df9f2e8807f4bb88dc90f5e59e82960bc35714d4643a4eb1fbffe1890303bf53f760cfb52a8d058158641c6fbd991b4cec6ca80f228fe2f9d00e6f2fbfbb8b01 SHA512 235d0ee4af23297d80450c1a6c667421ea67d2676c4b95b8cbea9acd1c8520438eea1cb9ec1e4a9d2ee19def563f33f1ee512f7092ac38c9c9adabd828cd8dc4
 MISC metadata.xml 405 BLAKE2B 47880df93bf397e1a7d905a0ade7c385eb7f97ca4e99fd5687f15147adb093da1312f518b6179d7ab9095a355d73147091787a0d3dc90200cef3e8cf7320a8c8 SHA512 36da0e0199b41608190b0e39de2b82bea5516890208c57744b93e527904501de01b1bfd4e20fc74450bd7b9ac4d152e0d57e31a35deca0b1edddc9ce60846d0b
diff --git a/sys-apps/watchdog/watchdog-5.14.ebuild b/sys-apps/watchdog/watchdog-5.14.ebuild
deleted file mode 100644
index f22eacd43f2a..000000000000
--- a/sys-apps/watchdog/watchdog-5.14.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic systemd
-
-DESCRIPTION="A software watchdog and /dev/watchdog daemon"
-HOMEPAGE="https://sourceforge.net/projects/watchdog/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm m68k ~mips ppc s390 sh ~sparc x86"
-IUSE="nfs"
-
-DEPEND="nfs? ( net-libs/libtirpc )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	if use nfs ; then
-		tc-export PKG_CONFIG
-		append-cppflags $(${PKG_CONFIG} libtirpc --cflags)
-		export LIBS+=" $(${PKG_CONFIG} libtirpc --libs)"
-	fi
-	econf $(use_enable nfs)
-}
-
-src_install() {
-	default
-	docinto examples
-	dodoc examples/*
-
-	newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
-	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
-	systemd_dounit "${FILESDIR}"/watchdog.service
-}
diff --git a/sys-apps/watchdog/watchdog-5.15.ebuild b/sys-apps/watchdog/watchdog-5.15.ebuild
index 3c3b6f51e119..1907cbce3c03 100644
--- a/sys-apps/watchdog/watchdog-5.15.ebuild
+++ b/sys-apps/watchdog/watchdog-5.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="nfs"
 
 RDEPEND="nfs? ( net-libs/libtirpc )"
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 9a1bf81a95ac..9cc046d69623 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/ms-sys/Manifest b/sys-block/ms-sys/Manifest
index 85eef021732c..a0ecd55af63c 100644
--- a/sys-block/ms-sys/Manifest
+++ b/sys-block/ms-sys/Manifest
@@ -1,5 +1,5 @@
 DIST ms-sys-2.4.0.tar.gz 46501 BLAKE2B 584d0fb711f447e14e5fde9b4cbec316069b1f6b96087ffe78e036dc217e82dfe3e2ef3588befd19437ec7dad5434a21901b244665730a7e8fef4592e20c0123 SHA512 17e2496d2e4815180b9f33fa0f206953fb3484e01c115a2e67d110fb04d421be7e694a434d991a7518579eadb9dce4e907dbd849dbaf6fb506758c425faa14ec
 DIST ms-sys-2.5.3.tar.gz 76192 BLAKE2B c1046fa346088bb9abd39c8140479e11525fd1965fffebc0ca6ed8da354e354af6946f4bfd2a68ddca1f0b1bbb02ff94216d763a12f4ca43de0cd9ba1aa4d877 SHA512 18080bef903c68b6032e04124f3b3b9f0eb58517b338c6bd795846d786ee0af6b65760166b591090ad865a08a03346675f3c34ce59c64215059dac1439b558d8
-EBUILD ms-sys-2.4.0.ebuild 686 BLAKE2B 840925b284ef4d9fb007b6accfe4b2c9f5b8e3cd8ffab4d7de17d2757d87043e6c9d85e8e1ed557217c19385cc0926dc75607b22ebccd5ae7376c28b02f277c8 SHA512 73d1985a0794e5ae175e84a60fe6aa0a4100c4e22f37163dd4e345079ecc001d79cc7ba63577920065dea46e96587c10f8bd1217badb6f62487f1f4e04191ab8
-EBUILD ms-sys-2.5.3.ebuild 688 BLAKE2B 1385a5697435db95588bdf5d47249ebd33df3aad2bf7bcdd41f3fb9cb493fbf287c07ac036e73ceb11ef38f6f306f217d1822a5c9b8f948a0671c4a60e3ae4f5 SHA512 d1c9417e30f906fa7e387e853754937dc1b4c59235b1a2fae7137a445e215445eab1e69f49dbe338dce40ee883ec261d683c2d09ee3aa14f6d38a244721c6b90
+EBUILD ms-sys-2.4.0.ebuild 674 BLAKE2B 8d9a9cf58f37719f806b9b1d6c24eb3c12917c68eabc5335fc489f289f915d3fcdd8e6307fcd489bb9c1e8fa4ecfb13ec7c706490018107c2a8b2631835525f7 SHA512 c8cffb3ad411300c5ebcb2ae91be4a10f530c91ebb59f9de88f1895d3e57fb7771eb0cd60eb080042f219d7640c65f4806030f32fb40eb0baea725937fd8b0b3
+EBUILD ms-sys-2.5.3.ebuild 676 BLAKE2B abd4cc612c096937cfd6b7c475b0caca40a9f889a12e6e3f583a38c99eb4711e1de61a42425952c1a7806dc7905aa80ef65e4af4b7d65a1d4338e49f0c4342d5 SHA512 d794ef17fda984747d7b4f600f2902cb9e879536b5d650a4a0e5bb8c500b82685fbf2a0012538cf4d44a218cd28baca4b36f0eefd22912479d9626f4d0fd120a
 MISC metadata.xml 312 BLAKE2B 1a9a47e9b027c4d381574e1b6f77df7b0f1de5cb9bd2d6d836f01062a65581a2e68d4847352d3aa263491ce03a69707f1cadc107ded11100daa95932f4d2e9a7 SHA512 7cef8408091a48c263cdcbbeb6dab1043f75748cb74415f1376e5a990862e371ac09b902a8d8c46455d20de3b6b81a7fedc16be3265f7613dc8466fd879627bb
diff --git a/sys-block/ms-sys/ms-sys-2.4.0.ebuild b/sys-block/ms-sys/ms-sys-2.4.0.ebuild
index 5069d9ea03d1..af51e97c92db 100644
--- a/sys-block/ms-sys/ms-sys-2.4.0.ebuild
+++ b/sys-block/ms-sys/ms-sys-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="linguas_sv"
 
 DEPEND="sys-devel/gettext"
 RDEPEND="virtual/libintl"
@@ -24,7 +23,7 @@ src_compile() {
 
 src_install() {
 	local nls=""
-	if ! use linguas_sv ; then
+	if ! has sv ${LINGUAS-sv} ; then
 		nls='NLS_FILES='
 	fi
 
diff --git a/sys-block/ms-sys/ms-sys-2.5.3.ebuild b/sys-block/ms-sys/ms-sys-2.5.3.ebuild
index ab13347f7f5c..32e1eb0d72c9 100644
--- a/sys-block/ms-sys/ms-sys-2.5.3.ebuild
+++ b/sys-block/ms-sys/ms-sys-2.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="linguas_sv"
 
 DEPEND="sys-devel/gettext"
 RDEPEND="virtual/libintl"
@@ -24,7 +23,7 @@ src_compile() {
 
 src_install() {
 	local nls=""
-	if ! use linguas_sv ; then
+	if ! has sv ${LINGUAS-sv} ; then
 		nls='NLS_FILES='
 	fi
 
diff --git a/sys-block/whdd/Manifest b/sys-block/whdd/Manifest
index 5af893500fb8..a1426c33952b 100644
--- a/sys-block/whdd/Manifest
+++ b/sys-block/whdd/Manifest
@@ -3,4 +3,4 @@ DIST whdd-3.0.tar.gz 45865 BLAKE2B 788ae197c5607f9044f68523336786eacf40eca382d53
 EBUILD whdd-2.2.ebuild 556 BLAKE2B 72773454e34f2236b54ea111b20d50dd13cfb94fe6360b29195bd6be09eff940fd1f01539010aa2a21262ef56f2d49516b6725f844ab42873bf0bc83a1cee8f0 SHA512 69c326f030f700d29ff945ac33ae6714a6f69d46a5b2f75bd8d061132a5e7dc13f710ce9d64746dd63918f5a395203f6c967088871207911927f06b2017a8eca
 EBUILD whdd-3.0.ebuild 632 BLAKE2B d177acdf1867745e8c648dd342c21b05819d561a37b1c7ea2382846bac3382e621f89e5e7e73b28e4661b09dddf014f8c3bae91cff4f5926c1414608e94f0547 SHA512 553f3a5ae8a56718e58817a7474bca3614f2beb8f35312fc5d72bd0802a732f05d5ecea313be04de6f48f5757bf830c11508b923f7cb11de7820ec13116425aa
 EBUILD whdd-9999.ebuild 632 BLAKE2B d177acdf1867745e8c648dd342c21b05819d561a37b1c7ea2382846bac3382e621f89e5e7e73b28e4661b09dddf014f8c3bae91cff4f5926c1414608e94f0547 SHA512 553f3a5ae8a56718e58817a7474bca3614f2beb8f35312fc5d72bd0802a732f05d5ecea313be04de6f48f5757bf830c11508b923f7cb11de7820ec13116425aa
-MISC metadata.xml 560 BLAKE2B cec4fa8bd69a21f321a37303158cbb2b418df9aa0548f643d9c5a458309ae3a377dc5bcc3afefe55cb5750effd5a546bc3b9d71965a443f55b621b5bce319c25 SHA512 270b445d727a11e85c984678ede2cbfefe3ba3dd1fcff8aef609e89c06858b9bc669d6d004eceb19b96f5208856ed0dc1710704063bb88649e18adf8449d1664
+MISC metadata.xml 325 BLAKE2B 4a164b15722878b9245897bdee75a486272fce67b8b0a6fcac04ac4ad4933ab9bbeb05bd0bb5273d56fe75fe72d468b5efd76d5c4e9bce53920af87ae3a0cce4 SHA512 5c0da6b1d5e04ff3adfe9f1eb4af339f72045eb38a9993a7c6db5b8a9c302e7c7651a0e245f82912d8db2ec9e450bb55ffeab398559d8f66dd084b106d40bf1a
diff --git a/sys-block/whdd/metadata.xml b/sys-block/whdd/metadata.xml
index f1a94f394c1c..6cf10586a8f4 100644
--- a/sys-block/whdd/metadata.xml
+++ b/sys-block/whdd/metadata.xml
@@ -2,18 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrey_utkin@fastmail.com</email>
+		<email>andrey_utkin@gentoo.org</email>
 		<name>Andrey Utkin</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>maksbotan@gentoo.org</email>
-		<name>Maxim Koltsov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
-		<remote-id type="github">krieger-od/whdd</remote-id>
+		<remote-id type="github">whdd/whdd</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index fc7c53f2abf6..2d48f6dc4aa5 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/unetbootin/Manifest b/sys-boot/unetbootin/Manifest
index be59a1c20722..a14b9d5754b2 100644
--- a/sys-boot/unetbootin/Manifest
+++ b/sys-boot/unetbootin/Manifest
@@ -4,8 +4,8 @@ DIST unetbootin-625.tar.gz 22671470 BLAKE2B 7420d804f1a490edd701646a3c228687316f
 DIST unetbootin-647.tar.gz 16253287 BLAKE2B 4095e2cc990de6a01d46e3861d20cbbd1dbb04ad90c929ea72034d935b82669e482032ca3289e717fa9d7cdd9a147bb19ce2e5c610f046f5ab9470a494a35d83 SHA512 487be195286dd1e7712afa86cb75f8a79a3acce77f5cbd2571ddad74533d84a90e17b96afecfd2c9831825975b6c562bfb218b583a042600c49a14179129e8bb
 DIST unetbootin-655.tar.gz 16258032 BLAKE2B 2cdf307702851d87302aac3246118c13c5c2a99f1a3a3b98156c5e0ca905d8fe79c87ce90817fee696adf2572bf26a4684f56245ff1e3573a1b7f97a489da970 SHA512 723b4c1499b5c9afd93e5ee3803c9ca18ee5ef5f7731797eedc194a2bbcc2c5be93cc6cb1059f8514f93a8c9e6d650aec40513f649b41382ae27c2f92389d709
 DIST unetbootin-657.tar.gz 16258176 BLAKE2B 7124e3a4cace41b1ca61ca468e37adc90ae7d3099f54dc5da200cc7b7d94567afa5b4a597ba7d7e3a1327951fd7e61f320bc676b72ba68c7255e9145e5791adc SHA512 69ffdbc23f372c795e84267dfbed2221783a7efc9b1d5f589e7c308384cdfd0d9cf0950058f665e2c10bf6f17e0efd3eff81a1bedb98da316583f2462dfed2d9
-EBUILD unetbootin-625.ebuild 1959 BLAKE2B afce52cc142c878439e02aec9680e4c4143e940c69d99a94f835d13679ca5ab2102516a43f00696135a547f3d09e608ccd2e86bd800fa959d83e9e2ddda708ff SHA512 afb27adbe35f5f0086dc7e36e51ea0ef1750d878fe34fce70feaa768ec78d28b1f40f0a2c2926977451869e9c8c60798d46402826252cd8a5edde87a2eba1be0
-EBUILD unetbootin-647.ebuild 1885 BLAKE2B 7ac82c159823f908998ee56a266823fa4f86ca621de631d52e36d899608b7bb541b5e412e9081be1ce48e666df61594fbda2019b83dfd6d24e47f7e8e43c4f5b SHA512 3468235ed6b64ec3075c771360b993669478844db1fec6184397b6adbf7f98b4933885de7ea370c02cf47c38dcb4250b0f99e1e619e34822ce21ddc32ac25b8f
-EBUILD unetbootin-655.ebuild 1840 BLAKE2B 147af746b341bf6b900e6b60065f66dd37a3abe76be7bc820b633a05a1c57d43808dfdd5a3df6595d5619b6d5806360dbfc8ca2e7a8dbd3566c9da5c8bd81554 SHA512 63377a246ad1e402bdee0b5f8e18a758263031edd241b0a71dbdf0c1676610acc012b823f6c588123d03caf77c6beb43ef955f342cf3d7fefe2ca2319423f278
-EBUILD unetbootin-657.ebuild 1840 BLAKE2B 147af746b341bf6b900e6b60065f66dd37a3abe76be7bc820b633a05a1c57d43808dfdd5a3df6595d5619b6d5806360dbfc8ca2e7a8dbd3566c9da5c8bd81554 SHA512 63377a246ad1e402bdee0b5f8e18a758263031edd241b0a71dbdf0c1676610acc012b823f6c588123d03caf77c6beb43ef955f342cf3d7fefe2ca2319423f278
+EBUILD unetbootin-625.ebuild 1911 BLAKE2B b362bf928a85b698e0d2ea6db742d53bf071caf35771e2ea5b3f96f0b794e505c793aba181857e7272dca830c149c8c36aa2427186327cb899a1dbcff533467f SHA512 065c6b64c4ab10736e4d5f8f0a9e4e4e3f8fbfae57ca1af94de4e0fbd81f381dcb632e9a87672842ca12df5adca5e01175d9121da3e6729dbde9778c2a470925
+EBUILD unetbootin-647.ebuild 1837 BLAKE2B f73267488fe127d2eb827c4a2df3dffae1c09a1e968e9730d0bcc9d35330e56ae576a49321b036127454b78216cfccd0daf5c33db3880db8d0cf50f6c36910c1 SHA512 e791496f869a9b335ea101fc8b74737305ff71d7eeca8d460a293af79475eda5edb5b13dbdb53df61ff8962b7989bcbaf6c78a9144bcc75c80ca80adaa49632e
+EBUILD unetbootin-655.ebuild 1792 BLAKE2B b761c7c0bc235441485024985e6307a86c1fa47086dc340a108c5f31df09263aa1a63ba1ff5b72e58f89b8cd3fcec06342d59396858f2523de5c987486eedf96 SHA512 98d71cb1cce6b9132817501f24438aa005ad1e571183026869617550dfa7962421ddc5e0534f459680dbd314b079a459aa940349b4a2a06f511e76f56f4d9e0c
+EBUILD unetbootin-657.ebuild 1792 BLAKE2B b761c7c0bc235441485024985e6307a86c1fa47086dc340a108c5f31df09263aa1a63ba1ff5b72e58f89b8cd3fcec06342d59396858f2523de5c987486eedf96 SHA512 98d71cb1cce6b9132817501f24438aa005ad1e571183026869617550dfa7962421ddc5e0534f459680dbd314b079a459aa940349b4a2a06f511e76f56f4d9e0c
 MISC metadata.xml 385 BLAKE2B 05836339f25bd812b23c8b93a6f05934a4bfa12d9fdd61f73140131c2d7609a5d1e257ed80c2cd983020720645e5444078cc71f2f51be9a2d435715e38ceea3f SHA512 9676e393ac2d18489433f0e658340a3eec0e01e0b35ca786540b07a6466f0b572f5d5bf115e6dc0b5c4898c00f630b9f5023f62f8e8f3a96c105bc74f918eb21
diff --git a/sys-boot/unetbootin/unetbootin-625.ebuild b/sys-boot/unetbootin/unetbootin-625.ebuild
index f6884665740b..aabc1aa868d7 100644
--- a/sys-boot/unetbootin/unetbootin-625.ebuild
+++ b/sys-boot/unetbootin/unetbootin-625.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,10 +19,6 @@ UNBI_LINGUAS="
 	zh_CN zh_TW
 "
 
-for lingua in ${UNBI_LINGUAS}; do
-	IUSE="${IUSE} linguas_${lingua}"
-done
-
 S=${WORKDIR}/${P}/src/${PN}
 
 DEPEND="dev-qt/qtgui:4"
@@ -52,7 +48,7 @@ src_prepare() {
 	# Remove localisations
 	local lingua
 	for lingua in ${UNBI_LINGUAS}; do
-		if ! use linguas_${lingua}; then
+		if ! has ${lingua} ${LINGUAS-${lingua}}; then
 			sed -i ${PN}.pro -e "/\.*${PN}_${lingua}\.ts.*/d" || die
 			rm ${PN}_${lingua}.ts || die
 		fi
@@ -82,7 +78,7 @@ src_install() {
 
 	local lingua
 	for lingua in ${UNBI_LINGUAS}; do
-		if use linguas_${lingua}; then
+		if has ${lingua} ${LINGUAS-${lingua}}; then
 			insinto /usr/share/${PN}
 			doins ${PN}_${lingua}.qm
 		fi
diff --git a/sys-boot/unetbootin/unetbootin-647.ebuild b/sys-boot/unetbootin/unetbootin-647.ebuild
index e449aefee55a..0371e75f2c8a 100644
--- a/sys-boot/unetbootin/unetbootin-647.ebuild
+++ b/sys-boot/unetbootin/unetbootin-647.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,10 +19,6 @@ UNBI_LINGUAS="
 	zh_CN zh_TW
 "
 
-for lingua in ${UNBI_LINGUAS}; do
-	IUSE="${IUSE} linguas_${lingua}"
-done
-
 S=${WORKDIR}/${P}/src/${PN}
 
 DEPEND="dev-qt/qtgui:4"
@@ -51,7 +47,7 @@ src_prepare() {
 	# Remove localisations
 	local lingua
 	for lingua in ${UNBI_LINGUAS}; do
-		if ! use linguas_${lingua}; then
+		if ! has ${lingua} ${LINGUAS-${lingua}}; then
 			sed -i ${PN}.pro -e "/\.*${PN}_${lingua}\.ts.*/d" || die
 			rm ${PN}_${lingua}.ts || die
 		fi
@@ -81,7 +77,7 @@ src_install() {
 
 	local lingua
 	for lingua in ${UNBI_LINGUAS}; do
-		if use linguas_${lingua}; then
+		if has ${lingua} ${LINGUAS-${lingua}}; then
 			insinto /usr/share/${PN}
 			doins ${PN}_${lingua}.qm
 		fi
diff --git a/sys-boot/unetbootin/unetbootin-655.ebuild b/sys-boot/unetbootin/unetbootin-655.ebuild
index 453496db6670..1007cc620a17 100644
--- a/sys-boot/unetbootin/unetbootin-655.ebuild
+++ b/sys-boot/unetbootin/unetbootin-655.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,10 +19,6 @@ UNBI_LINGUAS="
 	zh_CN zh_TW
 "
 
-for lingua in ${UNBI_LINGUAS}; do
-	IUSE="${IUSE} linguas_${lingua}"
-done
-
 S=${WORKDIR}/${P}/src/${PN}
 
 DEPEND="dev-qt/qtgui:4"
@@ -50,7 +46,7 @@ src_prepare() {
 	# Remove localisations
 	local lingua
 	for lingua in ${UNBI_LINGUAS}; do
-		if ! use linguas_${lingua}; then
+		if ! has ${lingua} ${LINGUAS-${lingua}}; then
 			sed -i ${PN}.pro -e "/\.*${PN}_${lingua}\.ts.*/d" || die
 			rm ${PN}_${lingua}.ts || die
 		fi
@@ -80,7 +76,7 @@ src_install() {
 
 	local lingua
 	for lingua in ${UNBI_LINGUAS}; do
-		if use linguas_${lingua}; then
+		if has ${lingua} ${LINGUAS-${lingua}}; then
 			insinto /usr/share/${PN}
 			doins ${PN}_${lingua}.qm
 		fi
diff --git a/sys-boot/unetbootin/unetbootin-657.ebuild b/sys-boot/unetbootin/unetbootin-657.ebuild
index 453496db6670..1007cc620a17 100644
--- a/sys-boot/unetbootin/unetbootin-657.ebuild
+++ b/sys-boot/unetbootin/unetbootin-657.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,10 +19,6 @@ UNBI_LINGUAS="
 	zh_CN zh_TW
 "
 
-for lingua in ${UNBI_LINGUAS}; do
-	IUSE="${IUSE} linguas_${lingua}"
-done
-
 S=${WORKDIR}/${P}/src/${PN}
 
 DEPEND="dev-qt/qtgui:4"
@@ -50,7 +46,7 @@ src_prepare() {
 	# Remove localisations
 	local lingua
 	for lingua in ${UNBI_LINGUAS}; do
-		if ! use linguas_${lingua}; then
+		if ! has ${lingua} ${LINGUAS-${lingua}}; then
 			sed -i ${PN}.pro -e "/\.*${PN}_${lingua}\.ts.*/d" || die
 			rm ${PN}_${lingua}.ts || die
 		fi
@@ -80,7 +76,7 @@ src_install() {
 
 	local lingua
 	for lingua in ${UNBI_LINGUAS}; do
-		if use linguas_${lingua}; then
+		if has ${lingua} ${LINGUAS-${lingua}}; then
 			insinto /usr/share/${PN}
 			doins ${PN}_${lingua}.qm
 		fi
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 1188a2e32bb6..9458cdd05f13 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 920d56a1c96c..50f901fa6508 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -4,6 +4,6 @@ DIST keepalived-1.2.24.tar.gz 601873 BLAKE2B d2bbf6189f789dd2b61207e80d4262ca6ff
 DIST keepalived-1.3.5.tar.gz 683183 BLAKE2B 6242cbe61e8cbe80d094dbad3882b0116fc3cd129c5f0f082ec821d794dff53ab22a661feb1c11d2c5386bcea3c2727ed899ea2968dfa8a7ed4272b8596f0839 SHA512 ebd710167becd4b99b665877953d19477c11f1d1c736eb580a05dedd4946363b756553e20607f34aa6c35f57b7252d8a22287beedc316b62a745fccc4243a720
 DIST keepalived-1.4.0.tar.gz 731936 BLAKE2B b6adf7925cc81a4c6e6f69afaa28bd72f6c13076be03f2971775a63c823dac5c6fec46e0b6724af1a7ac9036a749b285429ba3ffad2d9ecc39ccc213cbe2cb28 SHA512 485eda5912d68663f011b8e79263ce1e38ed785919055b113536f63aab52c0d5f581a9ab1951c7f62362ac0a68ee921efc41934a4e535d6df7e59249ef32d6d3
 EBUILD keepalived-1.2.24.ebuild 1412 BLAKE2B 4319c70c9cf0acae2ed7e6cf283fee6aa86b2149367b94ba7500b5ac885a723cd6fc266f57c1e25618394f1f0ff114019b73c3ef1ea7fbf622870ee2a67973fb SHA512 3c4a6951cf0cb39bdd604af88f41f3895d5cf72c283d022b506c0fae841cb86adda7b11aa1d23247be17e26cd6cdf826fd45bae39b018f3477820a4dd2c26588
-EBUILD keepalived-1.3.5.ebuild 1537 BLAKE2B 798886e3536651e6ab49896ebc9a188310f0356f68849dce6c4424f8f6fe2472d97fb909e2aa24c5f9e9cb002338dc33ac1c0e91bb2e0bf2da45c8727942f4ba SHA512 3ae55193581379e963aa9223d7d6c57c62729ab7a2d948e8da5aa2ce3e72166cbc599a67525c30f62b82e5ea346c88668167d8712403295b601655e987d0a7b4
+EBUILD keepalived-1.3.5.ebuild 1535 BLAKE2B de72173107b82d208d8c518750eb614cf5916ae44ea8fca2b11b6f3e8b1683effcacd881196cbaaea5a3dd3ef438fe91a78dec14333abe04e9523b9bce3a6c93 SHA512 b2ffbd856c0837236c95215693dd031d93df6b87ad5ae92bef05688f61a7f767e1fa48d37b92d707457b48a554716209ce2ad0012a9e9eb153554045bc819b3e
 EBUILD keepalived-1.4.0.ebuild 1597 BLAKE2B 603fcdc04cc9906fd72a6075fbf1646569aa85cc6194a04db9b16cdbadd976bdfdb466e231cd0252a6ca45b20b807eace3c532fd0d6044c06247a67088e8876d SHA512 a88d95101d4a108b791d64050097fa6db3885e7f7f59b6c97d0068fd6823781b504e8291cbc114e5c1ea9c90641c6b011f37ff74751019b164dd15ab2c13a54a
 MISC metadata.xml 471 BLAKE2B 2dfba9fe3d7d39f8484baa1f1be9a59b5da8f6cc0da4a3af1ec07e5daf4f2522f802af51048463dfad54bfbffe0286ce8a3b9ff8889139ca32693bad378937e3 SHA512 203c93aaf60f7d0dcc6150fff2a4a3dd61fa4d6cfab26452d8efeed1d79096b17db7e47700582475b7e6607ae70521c32cc91015e7852dde22a7d828740946af
diff --git a/sys-cluster/keepalived/keepalived-1.3.5.ebuild b/sys-cluster/keepalived/keepalived-1.3.5.ebuild
index bc1103649b3d..e3a92de3f0cb 100644
--- a/sys-cluster/keepalived/keepalived-1.3.5.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.3.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 hppa ia64 ppc ppc64 ~s390 ~sparc ~x86"
 IUSE="dbus debug ipv6 snmp"
 
 RDEPEND="dev-libs/libnl:=
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 3d42fb64f4ad..d8cc02651dcf 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 5a82c044d15c..c04241d2b96e 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -10,7 +10,7 @@ DIST autoconf-2.64.tar.xz 1113892 BLAKE2B 598873209a67725150cd4cf09c4b78b26b3d17
 DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
 EBUILD autoconf-2.13.ebuild 1521 BLAKE2B 745ce1ba4d39b75cf89ed701bbf102092854922f1dc0be421326c0f3a95f2a32aa69dae8ca4ac0e7b0e738f0e4c0553126636674571376df8870d77afa5e1998 SHA512 493ba0d22c90ed02e77e2406f76bc6e2cc6c9c56e824ca8c7ce73a2e3e265868de5824ed9b0261f457903ca12068e24ea55c77e2709f9d28366fc25c9ac13091
 EBUILD autoconf-2.64.ebuild 566 BLAKE2B a0488603af961a72257e96959d28ff6fb552de3b19a9773a8af845f8a0c5e0f54ee5f93c40192d3c3409b7d16489cd4ae5aaad8925404962fc0c4d9fe0357bed SHA512 9449a2616671cac6a34f632c965a0bb59f38d0c0694b4412e547769d5f957b7ab82cef995c77641814c7c6e0682df3f3b754cd48252f44e38ba71e7d72fc448f
-EBUILD autoconf-2.69-r4.ebuild 1562 BLAKE2B e1a458209939aab920d4a25c4e9e7d34f974bbaebdac4698c2455951f5b5c27d96534784ce953e92279d98e5a4f950e415798c2576d2f3835d71abc544bf0741 SHA512 9ace3492275b950d8b197db4495fa3b8b027801c37572fc0bf50b71f609b6c258c0bf41fbb9adcbc7eb3d246910648c876cbac0a794fc76c8dbf76777bed3448
+EBUILD autoconf-2.69-r4.ebuild 1559 BLAKE2B 485c6148286adc9814ff0e8dd9cb6f1e7bb36c5f47a75041cecfe4c131e6679c10a195038d6af1763bb4491c4627a681017cb33351481d0ba82f479a2a5bd4d8 SHA512 d114c9bcd4f4acfba91b270ee3191d22d0bfd5579374859182701e56c855940a6ff315e0996b55adef475cea9367ffac2ce355b89e81d999b5fbfaeec36331ae
 EBUILD autoconf-2.69.ebuild 1517 BLAKE2B 0ffa84941b0f394404b767506cc3a0efedbc19e6b50e8cd3386ebbb75ae657e3c828791f72c01e95982670ab1783c4be301f7562884b93c1eca6c8d5065b912c SHA512 9ac5e366d81466493aa7e8202bc688670e219071b8bcf0801dec14df0c2977bd3520a95cd343b9658ae7327a4e09b5b9fe4e5c5f9faa4982260b83c1e4368cd4
 EBUILD autoconf-9999.ebuild 1361 BLAKE2B 70f04f869ac9481058e94197b617498fc5551ba3358a7f418d4fe2dd87a2263f47eeb431a2422e872a2e4d7fed903933a8914bfc19ba2e372e6a7b2285854a1b SHA512 cbd6d7f64866419b258c7f711eff2dff2f1dbb11847d80d2d7dfa3cadc11c37ec457e9e351ca56dadbeb73b0466e81d24efae4121a02751abdbf63c7595cbce2
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf/autoconf-2.69-r4.ebuild b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
index de99da3e030e..f908b5d23b9e 100644
--- a/sys-devel/autoconf/autoconf-2.69-r4.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit toolchain-autoconf
diff --git a/sys-devel/bc/Manifest b/sys-devel/bc/Manifest
index 1a950b0e11f4..0f5be59eaad0 100644
--- a/sys-devel/bc/Manifest
+++ b/sys-devel/bc/Manifest
@@ -3,6 +3,6 @@ AUX bc-1.06.95-void_uninitialized.patch 351 BLAKE2B ad293d5efcebc2cf85a2d1a99e85
 DIST bc-1.06.95.tar.bz2 290069 BLAKE2B 774f07b1f85b4de7c4707baa355caed5a9fc7b3a5ee1a14f4e9fd59f47a4bbdf34bcb76dc05de4dd8c65615284c3588ad7961fa493ed559a0e8880647835bda0 SHA512 16ec13f87ef76ad4de77d378ef8d65a582adca1bf661c9d7675e78d940680c77e81a00a01817fde7c1ad1524562d6f933caa5c42a0686f3f85aadbb39393afb1
 DIST bc-1.07.1.tar.gz 419850 BLAKE2B dcedc193be5521aa0fa3a19746233ed65bc1fe8ef12e15155341706de6fbeecb6dd7ee4ab11e2d4b3aca2ae7097cce89e389b3573493bbc893e00b4ed3239594 SHA512 02126d0db6b6ed06d56cfc292d6f5475ff1e574779d7e69c7809bbb1e13f946f57ea07da2a7666baa092507a951a822044b0970075f75eefe65a5c1999b75d34
 EBUILD bc-1.06.95-r1.ebuild 1510 BLAKE2B 2d4e498eebe76077986a82c249c6bcbd2fcf6628b27c499cdab4952822b992d11854cac88832f30c5a7b618f96bc9b2063fdce9bb3f118d8df5b0400f7f0a52f SHA512 d246ee01a277848789ac860c52d4b1bbab93246b02e5baf09099ba1e88978f824e34abaefa732a4cdf7b41bc7186f959c622fbe2b9fceb14af41e0a313f3b1f4
-EBUILD bc-1.06.95-r2.ebuild 1633 BLAKE2B 682fe710dd128ec98a264ec31f5444d71f95cb264d34df211e64b94edbbddddd46b127f70e5bd9c4290b5c1866ce4430310920bba1611f3e7ab2b5faf2cf0f07 SHA512 11e823917b4103b007ecf0601bc28d7e5d2525a12b1e935d470baf472db55a711a32416765bdbf9282cd913da1f8c9bd9696672220135a35a612350487455171
+EBUILD bc-1.06.95-r2.ebuild 1632 BLAKE2B be6bc243ba2b93300e87504104887302668fbdbab46856d49f4374a8f1246c037e61f574a5b9851875cc65c925785d9acd0bf2e6ef03689e82811b013172f8d3 SHA512 f6e62843c7b14b7290ca90716bb4be09a358fa66e8692a67a556159affb123acc4b390c41a42b3a6c044f04001665f2540c32fed827dca162ff60cf73b3c9876
 EBUILD bc-1.07.1-r1.ebuild 1273 BLAKE2B afc42976eb7c32847e0979a9d551c4504e3fc702781c7dea59efafb21937d8a824bfa6bfa67880aead8c3fb129e5bf2a4c065d28108f64bb0cda33ce730dadf3 SHA512 16bd0dc631c798e1ff3a1a42b887a149204bb48ec9efdd097a6ebfe8d31a1fa163530dbc7fa77b9ab174cacc96cb31ae1f9dac298cf51a13aff89d0c127fc964
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bc/bc-1.06.95-r2.ebuild b/sys-devel/bc/bc-1.06.95-r2.ebuild
index 76c624078a9f..f0ce2e80705f 100644
--- a/sys-devel/bc/bc-1.06.95-r2.ebuild
+++ b/sys-devel/bc/bc-1.06.95-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu-alpha/bc/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libedit readline static"
 
 RDEPEND="
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index a61cadcd46b3..8a37de9d65f3 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,13 +1,6 @@
-AUX use-new-path-for-functions.sh.patch 302 BLAKE2B 9aff99c39e97553c8d23ee141f354d0a27138a715d2ee13ee2cfc700d33d99d4f51b501d7edbe8333c68f1c4259f97c6479b6ec9f26e9f837d158d4e2d82cc1c SHA512 539d3bfaaef536958fd2018fd957c83ecf98eaf0b0a5a5360088ae4896a4bf0f51b417d73d21a21f946e8a84ac38115cb4c1700b5b6c1b0480b49f229469a5d3
-DIST crossdev-20151026.tar.xz 22160 BLAKE2B 36cd292ffc9e8051d2684315a1546260ea3de9ff6c1324d8c0463501c1ab2671a998f176220220f8050d3d816bff48d1e263b35fcc50139e6149965d4d163b30 SHA512 f60efd4ad867efd0eb33de5fe327ccbfe73b574c97507bc0edd7ef141ad74c035ae2a0d446180e6a9eb5f43197f44933a452245feec849bacfb03fc07067edd0
-DIST crossdev-20171119.tar.xz 22596 BLAKE2B 4e606f63aad234684b6400203fc22a9ff7dbd9f14dca5e2f2055f08207e412a3a3352921109100b32b4f6fb51cc0836ada4e8db8011d781e9e7c990d6c92d3d1 SHA512 3b8d7b89adf06d5ffef169ed1015532220c997731e083fd73c27d80ea09a6a7efd456734104aa58ef386426f9a04fed3147f37aefe4106c378a0b865bfffb2f0
-DIST crossdev-20171227.tar.xz 22780 BLAKE2B 983dd5da66c1e467b622867c9d474c7e1b7befd4fb91e1e008f7d7d8416bb077bcd06274fe8145ec9338f652e780d2ddd3a501f79b46af280cb5dbb4c8324965 SHA512 bc91e95aa9a927416f2b97b989657de5a740707bb4f4cbfc3d9e0626c3977b3091040104a52205762ef9cc0d3cd7933fb527efa20086dedfd9b390dc2be167a0
 DIST crossdev-20171230.tar.xz 23016 BLAKE2B 4661b3f9fac314b7346f0de7227d12ae2d6851e448f6d065471499df8ada5d699ef91c6b6bca285b2aefcbf67ab351fefbe9344c0884a7c0d33ff27215c8ed9c SHA512 bf8761a3018790501adb4bb173e3281d1d7628de8f65a1aa5df0b328a4af8088be466dbe8c185e7ed44aca31b078320a4f62c56351f4b7cbf832349184d9709f
 DIST crossdev-20180105.tar.xz 23056 BLAKE2B 66618f312b6f9492b1ccbdc7142e6b38035bb52f864a53d5b6afed702f31dcad11d647af68239dd6cb1af06b7eee5046507cffb03aabb27f758d0513ae9aa888 SHA512 f10ac454a996268e0bf798e2e322961873f3666c032f0ea3a0bc88eabd0428d894726726b089ca180ff9b718b5041be136c28a572ffb31fde76b8ac58a8fc1f2
-EBUILD crossdev-20151026-r1.ebuild 965 BLAKE2B e32a6498622e7e95cad638e4e98e769a6b3490181f9f6b5f436edc7ad7df0e15d5ea312a9450e87dbe6811e8ae95847fc6ff81231822d7625cf7dd4ae5de2320 SHA512 cd4084c2dcf43b410e35d4a99bc04b3fec726b3665834acb5dfd6403ec1cad86632a424fcac8afc72f98b3ab37f15e4de8ebb783c9dee81d4a472902a08b9da5
-EBUILD crossdev-20171119.ebuild 867 BLAKE2B ea8088420e1860a31811cffce653e91b57e40232394d8fc0acc4aaeb9210abc0f05c31335edb46bb6f46c8c207e659cba07156fb389d4f4c68ca29b5d188ba67 SHA512 1cc2e7d4e256f0186fb4e399f9667c28e4d61fe9e3725657a3e5f41a7fd424c695dfd81e289f69381d5dbfee118ae341733f2115b580fff9c43cc21db8051ca4
-EBUILD crossdev-20171227.ebuild 867 BLAKE2B ea8088420e1860a31811cffce653e91b57e40232394d8fc0acc4aaeb9210abc0f05c31335edb46bb6f46c8c207e659cba07156fb389d4f4c68ca29b5d188ba67 SHA512 1cc2e7d4e256f0186fb4e399f9667c28e4d61fe9e3725657a3e5f41a7fd424c695dfd81e289f69381d5dbfee118ae341733f2115b580fff9c43cc21db8051ca4
-EBUILD crossdev-20171230.ebuild 867 BLAKE2B ea8088420e1860a31811cffce653e91b57e40232394d8fc0acc4aaeb9210abc0f05c31335edb46bb6f46c8c207e659cba07156fb389d4f4c68ca29b5d188ba67 SHA512 1cc2e7d4e256f0186fb4e399f9667c28e4d61fe9e3725657a3e5f41a7fd424c695dfd81e289f69381d5dbfee118ae341733f2115b580fff9c43cc21db8051ca4
+EBUILD crossdev-20171230.ebuild 854 BLAKE2B d10029ed5c6d5c9333a949d3d0a9df31a3b5b180328036c90188ce326bc83a3801638379a6b856010fedf04ae12ebf14e9a8953084acec7ec87dc889d21057d2 SHA512 955cee7f5bb76c933c2c206d65cb6c25ba78725e6f414a0860fb9c09d244221837a2ac25767828c97acbff46b6d3241582ba0a54f2ebcc31d34ed616d1ce8a33
 EBUILD crossdev-20180105.ebuild 867 BLAKE2B 5f004170eb7dd1b3ab4d1e95227d2ce85df8dd4370252e57b40581843372bc82126b69cf6eb81be6597d7b535b0fd6ffe28333b4a50131506047cc47024ed677 SHA512 27a6f7bcc07db27cff19b0b894c976a0dc2d1acffda8a76708233f9acbe8c6b8024f5665087b470593890bbab47ed154a5866cf698591ee471b5d73733b4aaae
 EBUILD crossdev-99999999.ebuild 867 BLAKE2B ea8088420e1860a31811cffce653e91b57e40232394d8fc0acc4aaeb9210abc0f05c31335edb46bb6f46c8c207e659cba07156fb389d4f4c68ca29b5d188ba67 SHA512 1cc2e7d4e256f0186fb4e399f9667c28e4d61fe9e3725657a3e5f41a7fd424c695dfd81e289f69381d5dbfee118ae341733f2115b580fff9c43cc21db8051ca4
 MISC metadata.xml 356 BLAKE2B 2220babfa5cc38c63a0e8361b84d1f3b288e5d050fd587562cac160621a60efb109df5af98b6108c1cd442947911d76db38cc9b82ef83c7a52553d5dab231116 SHA512 9b90e3370e18885739fad8a1ff7fd420eae5cf188fde84e8aec8002bbbc390291bd37481e308ad584d33e643e9d17a47000c8ce0852780ff18c0bfddb7327cae
diff --git a/sys-devel/crossdev/crossdev-20151026-r1.ebuild b/sys-devel/crossdev/crossdev-20151026-r1.ebuild
deleted file mode 100644
index e13edd3253a3..000000000000
--- a/sys-devel/crossdev/crossdev-20151026-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit eutils
-
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
-	inherit git-2
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-	!sys-devel/crossdev-wrappers"
-DEPEND="app-arch/xz-utils"
-
-src_prepare() {
-	epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch
-}
-
-src_install() {
-	default
-	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/crossdev/crossdev-20171119.ebuild b/sys-devel/crossdev/crossdev-20171119.ebuild
deleted file mode 100644
index 73d9c4690063..000000000000
--- a/sys-devel/crossdev/crossdev-20171119.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-	!sys-devel/crossdev-wrappers"
-DEPEND="app-arch/xz-utils"
-
-src_install() {
-	default
-
-	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/crossdev/crossdev-20171227.ebuild b/sys-devel/crossdev/crossdev-20171227.ebuild
deleted file mode 100644
index 73d9c4690063..000000000000
--- a/sys-devel/crossdev/crossdev-20171227.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-	!sys-devel/crossdev-wrappers"
-DEPEND="app-arch/xz-utils"
-
-src_install() {
-	default
-
-	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/crossdev/crossdev-20171230.ebuild b/sys-devel/crossdev/crossdev-20171230.ebuild
index 73d9c4690063..23a0747eb414 100644
--- a/sys-devel/crossdev/crossdev-20171230.ebuild
+++ b/sys-devel/crossdev/crossdev-20171230.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/crossdev/files/use-new-path-for-functions.sh.patch b/sys-devel/crossdev/files/use-new-path-for-functions.sh.patch
deleted file mode 100644
index 6d45575a7d9d..000000000000
--- a/sys-devel/crossdev/files/use-new-path-for-functions.sh.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/crossdev.orig	2016-02-18 12:28:49.926442767 -0200
-+++ b/crossdev	2016-02-18 12:32:25.962433210 -0200
-@@ -15,7 +15,7 @@
- 
- CONFIGROOT="${PORTAGE_CONFIGROOT}/etc/portage"
- 
--source /etc/init.d/functions.sh || exit 1
-+source /lib/gentoo/functions.sh || exit 1
- esyslog() { :; }
- die_logs() {
- 	echo
diff --git a/sys-freebsd/Manifest.gz b/sys-freebsd/Manifest.gz
index 5493c989af77..d9d0e195ca64 100644
--- a/sys-freebsd/Manifest.gz
+++ b/sys-freebsd/Manifest.gz
diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest
index 9da68bf803ae..33e53a06d3d7 100644
--- a/sys-freebsd/freebsd-mk-defs/Manifest
+++ b/sys-freebsd/freebsd-mk-defs/Manifest
@@ -3,7 +3,6 @@ AUX freebsd-mk-defs-11.0-gnu.patch 1946 BLAKE2B 5d9cdff486102e88aa7e7a12ed2d6af4
 AUX freebsd-mk-defs-11.0-libproc-libcxx.patch 369 BLAKE2B fdaefd66f08bad103db14ca3b32e5898ff09587094c6460743b3034e1549777c40abf99a2537c84535df1bee5b22f8fe96d65d6afd9c951d2121ed73cf94f473 SHA512 87de2c90588bccdc2e74ee206f2ca4135fbf5a4674d8400479d5eb08575a30a5b421bb81008ae1cf577e7acbebdc951fd1bd204b7b99f2818343c3f74ed59545
 AUX freebsd-mk-defs-11.0-rename-libs.patch 478 BLAKE2B 83171c7cffbfc5a64ca0b73b3c0da30b76056df877fa8b6501992e36ec3131ae67d52e3dbfb650a081f8b7bbfa2a3d74fa5ad1c4fb7bd6f0d1b267caa203b9dc SHA512 e07091f6b91d4d02cc6db5f76e0fbddc682f594dc5b9176cf282758253eddfb03093f4ef0b0bb5c514724d6065a6a4784e518526b32a86c7b344f43cb1e56ec2
 AUX freebsd-mk-defs-11.1-gentoo.patch 12921 BLAKE2B 1a0e8c098e6ccd6294bd02c3b8cf50faa69b3ae47f00b2fb20b3078439b2f5170d2f9e488fddbeaaf2c06a32355dd4ed563ecfc0854cc32736edf367be932355 SHA512 5253780ce30522f90d7c6ba7292333e3e8edf7a295042f954dd70d3b0806a0cea16f8f6eb0fc9bd9e60d6d191569b4e4248d96b114c5133832c5a1c5e3a50339
-AUX freebsd-mk-defs-add-nossp-cflags.patch 1017 BLAKE2B 2093435dece5cfc8dbbcd1035ee4930c7b30d35b5450f7548c3fa9e34e6ac451731cd4f93c8acd3ba045150ba5674ea557ed7c1e8c79fa2fef1d3627c44afac5 SHA512 012897f4f4b4c3f71d1288ab57adeed56d7f399e508cfa4f593a1f787443e3e4752f7002c86f5da65952ac57eb908d0cce751d7b029048b1c70a9b3c79bea913
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
 EBUILD freebsd-mk-defs-11.1.ebuild 1148 BLAKE2B 5e0cfc31dbd47afb392c69125e3a29c251216436f6724dad42aabcc55f87f27fb0c687c325a284b18d3ef7ce470cf15356e05a057bad439485682ead320d7980 SHA512 d3bf63b18797b3eb4193859f3c61e5ed810f2fbd9d491b82b072655cf7f9a42d0b69c634b9877635455ef38ecc2e29fc6fdb9179a5a62cd31570d8469fd294bb
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch
deleted file mode 100644
index 8eb80c38cc7a..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-add-nossp-cflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=511698
-
-diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
-index e438633..de4a05b 100644
---- a/share/mk/bsd.sys.mk
-+++ b/share/mk/bsd.sys.mk
-@@ -111,12 +111,18 @@ CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\
- CFLAGS+=	 -Qunused-arguments
- .endif # CLANG
- 
--.if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
--    ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
-+.if ${MACHINE_CPUARCH} != "ia64" && ${MACHINE_CPUARCH} != "arm" \
-+    && ${MACHINE_CPUARCH} != "mips"
-+.if ${MK_SSP} != "no"
- # Don't use -Wstack-protector as it breaks world with -Werror.
- SSP_CFLAGS?=	-fstack-protector
-+.else
-+# gcc-4.9, -fstack-protector-strong is enabled by default.
-+# Add -fno-stack-protector to disable it. Gentoo Bug #511698.
-+SSP_CFLAGS=	-fno-stack-protector
-+.endif #SSP
- CFLAGS+=	${SSP_CFLAGS}
--.endif # SSP && !IA64 && !ARM && !MIPS
-+.endif # !IA64 && !ARM && !MIPS
- 
- # Allow user-specified additional warning flags
- CFLAGS+=	${CWARNFLAGS}
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index a2ab5c9d413c..873cb24befd4 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -30,7 +30,6 @@ AUX freebsd-sources-9.1-mmap.patch 676 BLAKE2B 17fb129a34eb0280b1edfdb2a5b138443
 AUX freebsd-sources-9.1-nfsserver.patch 650 BLAKE2B d719735cfe035de970f42cc40dded1785c038ce03c568dd7ccaf5a3715f658131cb02e1291b2a327b54fdff1f58f76c5deb41332ba4a125cded18344e21a0a17 SHA512 e1d505440371d35722b3520212ded13acf5ccb433c18988aea08d8035881f633c04dedb912931684334154303731ad21ca849c02831f6b9122b54486fb5ab8fe
 AUX freebsd-sources-9.1-random.patch 792 BLAKE2B a730a48564bd3020d18381579709770a8541d3a3c0ede353a535f7e93f33ff62c800e9cf775e1bb56b5ba00917d1cd81294404dd660c6e954c01e352a5f413f9 SHA512 6e7137a5b68ec92a6eaa5d6bbc1609794f7a71210331959135663bf4021b6cffcbf87f23b5d757956a1ff6907929012490bd85ca0ec37efbdfc2b70de108bc99
 AUX freebsd-sources-9.1-tcp.patch 1249 BLAKE2B 829e42d1e5da6185fb7dd37d85331f3d5281f1f06ad0df08cb7e8da17160d7da7379e8bcbdf99cb9b052a231402229cd2352ee8848be7c33193ef971315a4d84 SHA512 46a2039ef4c000447ce22cd64515cffa34615e6980fba9f493c9cf527f45012f1d6128aadce401b3620667bfe9191d70c4c415f8e2d2c08617453822f73a029e
-AUX freebsd-sources-9.2-gentoo-gcc.patch 506 BLAKE2B 29faa9418a739978652baed5a9412796b91fe2d77514fe8ee9022237dc74c4ef8f65c34edea72be3fe9bb76694c600749443c9c7d0afa41ceb290bd0d04c4a8e SHA512 cf553ad66b5a55dd2383a55c9a3c5c852985c4842244569aef91596a98481ca12c6189dfdd5fb2badcbe7901a87c81a3e0432cbf10add66dfb481ddcf38ebdcf
 AUX freebsd-sources-cve-2012-0217.patch 856 BLAKE2B 7dcbe58d7e58165fbdf734d59554c6e05f1248bdbafd0b5fa8b820de2aae50c9dd15938dc66603a683ba225e5e4e1271a7acea10fd1d43c6595226cea85f63b3 SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9
 DIST freebsd-sources-9.1-en-13-03.patch 32571 BLAKE2B 63b49582f5f7a205edca766bf8552ce951db9189f142b05e5217c3e39df62773095c5afc2e05357f14ce39bb3c5b5761aa0d02bd25b286854b9e29ce1f92eace SHA512 013a21da3618da9098020c85abe42d99e4eeb8d6b9b818cd5c6d27ee2ea2d31b60ad4521e73cb996f2f5c99fd0f34bd4a35458977264c51e79f4f53bfca6e7cc
 DIST freebsd-sources-EN-1707-vnet.patch 356 BLAKE2B 6e586e8cc767c0f177b6f1175512c4d5bd4fdf9abb94b644348dbe8b681d4838bdba8c83496ae351fb075329fed4e270bdd8768ce63e8c99fc69ba36d3040d8c SHA512 2fdb58388acb98811588beeabaf8a533926f96ac3f594f53dd80dcdb38ede4fe0dd66f0dd7bb32b40a27f756e2b03fed91c4416cbdcd4c16dd8143f5438885d7
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-gentoo-gcc.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-gentoo-gcc.patch
deleted file mode 100644
index 9076fd2b595d..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-gentoo-gcc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
-index e504f75..7aa63df 100644
---- a/sys/conf/newvers.sh
-+++ b/sys/conf/newvers.sh
-@@ -86,7 +86,7 @@ fi
- touch version
- v=`cat version` u=${USER:-root} d=`pwd` h=${HOSTNAME:-`hostname`} t=`date`
- i=`${MAKE:-make} -V KERN_IDENT`
--compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version')
-+compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version' | tail -n 1)
- 
- for dir in /bin /usr/bin /usr/local/bin; do
- 	if [ -x "${dir}/svnversion" ] ; then
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index c7993aaf3101..c7efe924e496 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 59fa1fc47360..75a491cd2f74 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -3,6 +3,7 @@ AUX e2fsprogs-1.40-fbsd.patch 352 BLAKE2B efef09c11bdf6ebeb89819dfefec241919afa1
 AUX e2fsprogs-1.41.8-makefile.patch 317 BLAKE2B 89f393fd0b09e853158707aa6ec7f803c8938138666459df6a2bbc1cc5e86ac107db67b40ffbd7b12694de8eb22863b6c910b6e192f42e07939c0206b248e627 SHA512 dbd738affe910d3812ca4d969a6d4295b09abc413cab23f29dcbd0c1e82eefa095a61a377c494dd9b7e1d189d4edadc469dbf2d1a1068c11dd5fc8311bd83f8f
 AUX e2fsprogs-1.42.13-fix-build-cflags.patch 290 BLAKE2B b37f9fd204bd35631776d68dda5cc9defb5e2bc54e0061778e5bea4886820829605cb092bb40a7f65cd0626d8ffe689bd1c8aad7d29f7c67e5166dd578925ddb SHA512 fed2a8502fafb56a21c88d680a42848bdc8921b228f74842ce3f702279917b6e6c0d1204ee060ea0d2d5ebb02465fc1f3d1a4304068a59b45bf1ddfbdfd46507
 AUX e2fsprogs-1.43-sysmacros.patch 3301 BLAKE2B 632663effe529a7b534ad28bbe971437e8a77aa9a9119eeaea901324661272f1fe6a62ff846de548b6810d6e6ec207e7ad96a00f98377f70b91f3017640e2d7d SHA512 181d1f71eb6776357521115ccd85227ee5c83bb798f198624722dc71e96f44f301ea79034182000f123fb9fc05db67de51206ff398c1a95f59b0f4dda8ba9ac6
+AUX e2fsprogs-1.43.8-big-endian.patch 1176 BLAKE2B cfb95d10c3fbc59f55d8325243a0d0bb30b6584fd9631d26682c613359a0c939a73ae5e0fd531d3390143cb4168efd372c4cdfc0d2c7f6291f0499d20115610c SHA512 713fb87767ca6c513cfad04e4a5ea59c40ced11edec5b3b85c5f1e58a788da7801973ee865a6ad96076ebd51a0ab28d4e320a5d191dfd8c4798445f0674be753
 AUX fsck_ext2fs.8 3802 BLAKE2B 379ef7974e29c654e4a69caa64c3703eecf375d63557915bdbfe23c8c0ca67cc9a13792988ba8c0b18bb4ae0819d220102f034499200fd20951e004d34273311 SHA512 639af16c7881bdfca55a9cd39623d3eeb9ae0ca93f8e65321c69ab1b2591cb17cdd0cfc21d27c20b8cc65bd295cccf23e47f740fffb91f4cf17e32959bb166d0
 AUX fsck_ext2fs.c 2793 BLAKE2B 65294fc9026bdb859a58d010f885fdbee2db4372a81b82ffa0722a0a3163885561bf06f0fdb73b4cf8c9cfc5bd0dc0c6ee0a7fb340a2416ce34555eff22f71a4 SHA512 1cac2963c0e85dd6a111bfe2a00f2b4f65c17a05bf0039cec073d4109ad4b0efee8905cff1a25098e0693f367db300054d92598a85dfbe8e5db7ff6419534af6
 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
@@ -14,5 +15,5 @@ DIST e2fsprogs-1.43.8.tar.gz 7474876 BLAKE2B b5d550a646facd2aae9de9758976e987ab6
 EBUILD e2fsprogs-1.43.3-r1.ebuild 4040 BLAKE2B a6100687d4e3edeb42d0328c592c9dc896aca97b883ead0bc866afe138dfb3a30126fb448fc5c30516d73c1a94c2fcc75dcf3bb6786ff36920850ca88ea5f84b SHA512 5053ec14ad968d6f4f8bb0cf0a227c0f56af71eaf0201fe7d53448c962f6f097aeb92b561381194aea58f5d3d99421d455ad50f280413d83ada6b281e1361c9c
 EBUILD e2fsprogs-1.43.6.ebuild 3794 BLAKE2B 30536b1a22b10fab64223baf79a8717aa6cc736fa94ee74dcbef4ef2a068ff0d5969b1a77fadc324ed8d81fcf1282f8e566faa130975befed2be83e570aaa6ab SHA512 79c0ebff04f84941e0959e52d4a0d5d5804fdca9ccad42c23d9523ce8091a1230f5e50a06d24b0f3bb8e125c9a71c80629d2ed58fc2fc5b49703f97ba176fe77
 EBUILD e2fsprogs-1.43.7.ebuild 3803 BLAKE2B 16d9ba317e345a07bd0505e3d6ebd7a50c2aca6e323bd9ee09e1a6390aa4965e6b5903d66cc52c82b19cbe9928fe4bc31613de5294eef8c521901bb648724ae0 SHA512 5ede2280b2d42c18e14315654f6dc092b02b757927ba1a4973417f514b6dc66f506dec85e69f1a0c00e177a3950b74bb42fe0994d15a50c2c83455cb7baeb7d9
-EBUILD e2fsprogs-1.43.8.ebuild 3825 BLAKE2B 4362d2301f7a41d03bd49ff2220274f4c459b8ea24b8df081a93eb117f605781c26a4578f1d80b9778a986eac6cfe8bc7d0a00e3b72b17d49789e93feaf4f873 SHA512 7cca30321f643180c7b7457e2e577467a0e85f7cf9523a6285c7fd5699db6b4cf04623dfd22712ba6bc2a3957a3976aa3f4300e22225d92108f6a5b0301900f3
+EBUILD e2fsprogs-1.43.8.ebuild 3870 BLAKE2B ed59d4d718cd64b2554f057deec993212ea20b91c73fd8556be3ccadc4b9b7abd7497a946509cf66e14ed3a86dff4140590d86cee18cc3d02b3d654682923321 SHA512 d9cc8c66e5143f53571a55c824e1a428ff46f5b9242e8855097725ac38611a3070a01236e9b3b438a6213f275c04e9fff294f8a15348906872211893d157482b
 MISC metadata.xml 520 BLAKE2B 3e908938de1132b5cde97c6b51b40f72c03e91301b54c14339379d2e2380414dd33096a87d64ff2fc7d886cd65fb16b9c16a376b7338c826f44917860f380be2 SHA512 a5ff91610ed175147f1a9c2c725a30380908c02fc04c6b7df2792cb4fd805f9137374d2a910e456128a7bf2fec9e83af3063bcb5f2ad51394bed8bed648e3905
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.8.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.8.ebuild
index ba0347721fd7..3637e695028a 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.43.8.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.43.8.ebuild
@@ -38,6 +38,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
 
 	# Upstream patches (can usually removed with next version bump)
+	"${FILESDIR}"/${PN}-1.43.8-big-endian.patch
 )
 
 src_prepare() {
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.43.8-big-endian.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.43.8-big-endian.patch
new file mode 100644
index 000000000000..8b3482f6d5fd
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.43.8-big-endian.patch
@@ -0,0 +1,37 @@
+From 876d9b0c8eac2fd80dd62bfa1b09adea62aa08f3 Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Wed, 3 Jan 2018 01:32:02 -0500
+Subject: libext2fs: fix build failure in swapfs.c on big-endian systems
+
+Addresses-Debian-Bug: #886119
+
+Reported-by: James Clarke <jrtc27@debian.org>
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+---
+ lib/ext2fs/swapfs.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c
+index 6e5cff9..b13dc42 100644
+--- a/lib/ext2fs/swapfs.c
++++ b/lib/ext2fs/swapfs.c
+@@ -19,6 +19,7 @@
+ 
+ #include "ext2_fs.h"
+ #include "ext2fs.h"
++#include "ext2fsP.h"
+ #include <ext2fs/ext2_ext_attr.h>
+ 
+ #ifdef WORDS_BIGENDIAN
+@@ -358,7 +359,7 @@ void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t,
+ 	if (inode_includes(inode_size, i_projid))
+                 t->i_projid = ext2fs_swab16(f->i_projid);
+ 	/* catch new static fields added after i_projid */
+-	EXT2FS_BUILD_BUG_ON(sizeof(ext2_inode_large) != 160);
++	EXT2FS_BUILD_BUG_ON(sizeof(struct ext2_inode_large) != 160);
+ 
+ 	i = sizeof(struct ext2_inode) + extra_isize + sizeof(__u32);
+ 	if (bufsize < (int) i)
+-- 
+cgit v1.1
+
diff --git a/sys-fs/udftools/Manifest b/sys-fs/udftools/Manifest
index acd8426a35bf..ea3708804355 100644
--- a/sys-fs/udftools/Manifest
+++ b/sys-fs/udftools/Manifest
@@ -1,9 +1,9 @@
-AUX pktcdvd.init 1307 BLAKE2B 983127f7c28a0820ce579b42792864f5466d46c19ffc81057489c3024023e42dc1eb69bd91f289431cbc3453e2d0d3cd87f7280dee7954946a487df9e0aacf9b SHA512 6c5c7a8b39067924c5be31a951043a1c44ff53d951fa9307fde2393aaf9c2b5f8960a042aae238d71a09696a3077d72ed41acdf261739c2829ab25130f3b795b
+AUX pktcdvd.init 1360 BLAKE2B 16d01b722b98340a8a858c4f5e80881d41b010b9c6af6e4fdd489e1d000129b2d2793f6be6cfd4673851c26919bb310a6a8cf9f495360d0f24624bd5784f0116 SHA512 22522ff6bf19b08ef928ff87e0e3ffdf476f08c0c8b318770e522ad5187f323b94b26a3153bb56488618e8adff66b5585401e63ddae34068c4b2de472b1f5755
 AUX udftools-2.0-sysmacros.patch 1203 BLAKE2B 87e9d5ce829584ff0dae366bc3c2b52bcce7115668cc0ed9387a49744a2f558103e58980f038da141ae250135278a89578d4c7b3295a73ba7d3cd7a8ebd37aa5 SHA512 2108fb8e6d2e35922a47a6c7d82d218770ac1294cf0d2c88f9e3794ff2d91112eca850f8cda14ce019cc4c7e1653c173c9a6b3fffdf117ac58bfebb351c3b880
 DIST udftools-1.1.tar.gz 656865 BLAKE2B 6e76251368c121ab07e02071bfddde5c4f4523cc858a7ffcc86063b48adbc03233fab18a3ff50b840fc603e7f48f386e15b4ca556046116d4b42f43c06927dc5 SHA512 9c415d1cae1d79d49b4f9e3e6881f0b44b31d59f6d722571badd78ee68c422899ee8b95caed0ac50e76c13d8ed118f58f79efe5cbf775438a163d68160a30742
 DIST udftools-1.3.tar.gz 447063 BLAKE2B ff23f23dd5b9753d9e4cba6e326d302346233ed0a836ccf35372e61ca1d7a5c14ff8f1d1505f2f9fba779f4379adf472b64ce60aa4ca0d3e51679ea863db2f0f SHA512 d67f74640cc600fbdf3d7a67caee1342c15507357e155c5e1066aa6f6b3e2667483107edd663eaed5ebb690c13337598a75c1955e69cbc782bd481af783837e7
 DIST udftools-2.0.tar.gz 541231 BLAKE2B 8e43f4b1ab0940d607987e972dc0244ad086e088441bf462e6ce75a668af62041b1c4d8bac5da6046d2943ace753498aeb721d9524b4442a84f1901fd92066e6 SHA512 178a20405de6cd48e5f58b0ed61565e2a463479cf6d40fd7d5895d7af768b814bf1d5849873740aa409eb8cb3e7cd480c07198f6b340c612a271241c737f76e5
-EBUILD udftools-1.1.ebuild 664 BLAKE2B b127bbd656e4cfcf6d3c4a929f1dd709fd843eb0e1edcedab2a0f4428c4c08fd92c677f846da641877be52e21040be2bb4bed4117754e47aa04bd13b8aac1508 SHA512 829b847f094d1c8146c76312febedf72abca1a29def30410c00d509bae9b4da16ff6b9afbafe62ba54f6c97f174b51ff76b455a35f4ce19498f76e1f8fd974c4
-EBUILD udftools-1.3.ebuild 668 BLAKE2B 792c3c992300fbbe75dc8dcaa81a0a52aacf42dcc8e730e4475a31968843164c989aeb4941f6a52729e6f0d946082e03c3ef8cc984ec48689c41bf2e924fad43 SHA512 c7358d1dfb3e6fd253543d07798ceb43ada57f5917f674f471d38c6bc7d9251f4547a98b260e6d73766eca109b5e2ed8fa0d83dba6b05cae217969cce84eae4b
-EBUILD udftools-2.0.ebuild 707 BLAKE2B f3e673a67284445436156633d9fcba73a07a2690574c3746ea483caad28d7645d5f646fec82ae9923b1799e90b09c12db11ae76d99eea916c8344e8debcf5b3c SHA512 3385545b56fed68c7c3730d81c9ef2be41f4f85dc319d667895a7730f02c30a16c816798fa7146880fb1776262556d569cc0d44c9c31f78becbe1f5a0a3e3d58
+EBUILD udftools-1.1-r1.ebuild 664 BLAKE2B 83cc88c60000a72e00fcbfd8e65ebf00eee41d96945a7ab8498ac691f61025ea20c02f73f654b3df7c5a92af85c82f8ec88b5b1b72da2f6433a64e97e7522dca SHA512 96b9d3d58ed472e9f06de7041b6a379c66439165431435dafe17a7cd8d37796643048d41f2c7e0e219dc930b82fb848659fe13d054bee74fc958dbce026b233c
+EBUILD udftools-1.3-r1.ebuild 668 BLAKE2B 911f0dcb67cfd8fea0503ce0a5ed9369b955d2c67d20903b169465a7a8c053aa3a9486ba71af073b16a675630682df8e0dc6d9e01d9075bc754949a22dccb431 SHA512 67b23bdbd67de34bbfbd444807a8d6cf483d97cfaa6c11587ac86968be887fec4890a27b961f3b4eec0096497cd08622a29d203cf6c43e413bcc4a55612ca58c
+EBUILD udftools-2.0-r1.ebuild 707 BLAKE2B f3e673a67284445436156633d9fcba73a07a2690574c3746ea483caad28d7645d5f646fec82ae9923b1799e90b09c12db11ae76d99eea916c8344e8debcf5b3c SHA512 3385545b56fed68c7c3730d81c9ef2be41f4f85dc319d667895a7730f02c30a16c816798fa7146880fb1776262556d569cc0d44c9c31f78becbe1f5a0a3e3d58
 MISC metadata.xml 389 BLAKE2B 9ce42e5303df1f4d7fc293387617a2b6335377b7a3943e768cd7f8e58e9dd456c568f9b72c1fe3d12f2876d364edfc184b3644aa76569e04bee22fbb3673d8b9 SHA512 049fe016aafa25e50396b166ac9931ea7c293aa581467fb587e0d79c0bc4e79621bc3d5bf295c2e9e589a517a4c1fcfbb863fb71175fe5061f99e45a26c7c61f
diff --git a/sys-fs/udftools/files/pktcdvd.init b/sys-fs/udftools/files/pktcdvd.init
index 97375411e0e2..97bd34368240 100644
--- a/sys-fs/udftools/files/pktcdvd.init
+++ b/sys-fs/udftools/files/pktcdvd.init
@@ -1,13 +1,16 @@
 #!/sbin/openrc-run
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
 
+command="/usr/sbin/pktsetup"
+devdir="/dev/pktcdvd"
+
 depend() {
 	need localmount modules
 }
 
 checkconfig() {
-	if ! [ -e /dev/pktcdvd/control ]; then
+	if ! [ -e "${devdir}/control" ] ; then
 		eerror "Could not find packet-writing control device at /dev/pktcdvd/control"
 		eerror "Please ensure that your kernel includes packet writing support,"
 		eerror "and if modular, ensure that the module is loaded."
@@ -16,20 +19,21 @@ checkconfig() {
 }
 
 get_rw_devices() {
-	devices_raw=$(sed -re '/^drive name:/I!d; s/.*:\s+//' /proc/sys/dev/cdrom/info)
+	local sys_file="/proc/sys/dev/cdrom/info"
+	devices_raw=$(sed -re '/^drive name:/I!d; s/.*:\s+//' ${sys_file})
 	count=0
-	for i in $devices_raw; do
+	for i in ${devices_raw} ; do
 		eval "devices_$count=\"\$i\""
 		count=$(( $count + 1 ))
 	done
 	devs=""
 
-	cdrw_caps=$(sed -re '/^Can write CD-RW:/I!d; s/.*:\s+//' /proc/sys/dev/cdrom/info)
+	cdrw_caps=$(sed -re '/^Can write CD-RW:/I!d; s/.*:\s+//' ${sys_file})
 
 	count=0
-	for i in $cdrw_caps; do
+	for i in ${cdrw_caps} ; do
 		[ "$i" -eq 1 ] && eval "devs=\"\$devs \$devices_$count\""
-		count=$(( $count + 1 ))
+		count=$(( ${count} + 1 ))
 	done
 
 	echo ${devs}
@@ -43,10 +47,10 @@ start() {
 		devnode="/dev/${i}"
 		[ -e "${devnode}" ] || continue
 
-		/usr/bin/pktsetup "${i}" "${devnode}" > /dev/null
-		[ -e "/dev/pktcdvd/${i}" ] || continue
-		chmod 660 "/dev/pktcdvd/${i}"
-		chgrp cdrw "/dev/pktcdvd/${i}"
+		${command} "${i}" "${devnode}" > /dev/null
+		[ -e "${devdir}/${i}" ] || continue
+		chmod 660 "${devdir}/${i}"
+		chgrp cdrw "${devdir}/${i}"
 	done
 }
 
@@ -55,7 +59,6 @@ stop() {
 	
 	for i in $(get_rw_devices)
 	do
-		/usr/bin/pktsetup -d "${i}" > /dev/null
+		${command} -d "${i}" > /dev/null
 	done
 }
-
diff --git a/sys-fs/udftools/udftools-1.1.ebuild b/sys-fs/udftools/udftools-1.1-r1.ebuild
index efaa1d7e62cc..f0ef22a1e86d 100644
--- a/sys-fs/udftools/udftools-1.1.ebuild
+++ b/sys-fs/udftools/udftools-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/sys-fs/udftools/udftools-1.3.ebuild b/sys-fs/udftools/udftools-1.3-r1.ebuild
index d2a858cd9b0a..cd7b7e75dada 100644
--- a/sys-fs/udftools/udftools-1.3.ebuild
+++ b/sys-fs/udftools/udftools-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/sys-fs/udftools/udftools-2.0.ebuild b/sys-fs/udftools/udftools-2.0-r1.ebuild
index c5a2970d94c8..c5a2970d94c8 100644
--- a/sys-fs/udftools/udftools-2.0.ebuild
+++ b/sys-fs/udftools/udftools-2.0-r1.ebuild
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index fa04015d84c7..df3fe601d8e1 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index e54c49815a5e..6828c6aeb386 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -2,6 +2,7 @@ AUX 044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch 1027 BLA
 AUX 044-0002-systemd-initrd-add-initrd-root-device.target.patch 924 BLAKE2B eeeb9efe85637db0566dd8f4c2543626ed8786b97293ed1f25c9aa543a4c239ba6771f6add7cf76cf540bffae82b68ed699a601f0f28fd3651e4c11440345b63 SHA512 443391ad3a70c3933d42129a298e12de007944c3141f8ec2785666ee5f66a24edc1eb5faa5c2016540aeb1fadb93139fce3b53b3960f7a5492aac2ff9bc95e70
 AUX 044-0003-50-dracut.install-use-bin-bash-shebang.patch 558 BLAKE2B 7a5c30a6a70b4dba8463c4701910dd9878f6923a572532b022cfd0c63e9f3f01559d5c2e5c419f8e3b7196d3e2c587279e16761e60e8e67d8fc8ab5d35c96cdf SHA512 657685b27d3ffd326fd1976ccd89cbe4ab9122b63f2a6a03cae3bd54663bd1a26366552550ea50af671aa5a604b9ca08caf1bc689551e46f7d208c7d5e83730b
 AUX 045-systemdutildir.patch 1665 BLAKE2B ddca173403586e0ec4f8af86bf9d8004a0fa6176155c8b9d3e7906fdbf23db910290d60cf1834da7635c75b58b107616a722b560b076608920f9cc4b3a6351ff SHA512 f576cd166e9ad03ffa8317dcffcd7c6f920ffa92251eaacc5c2a95e4ca88687bd1870c8f75ecf3b5fc81773f2d3e082dff647d6a313d183a6017fc79b7bc604b
+AUX 046-amd-microcode.patch 1013 BLAKE2B be9f9b545e5d68285f2b4e3a4ccee3e39c0c41349450053e411532c47e9634157df190ea2bceacb422a3f1b874ae256c34a4822f3fb964b8c06a05f7adec3a59 SHA512 c37734a66a9727cb0effc5a02b85e6bd2d3e5b05913657f517fcb26fc6cacc89398e28dd2865e5abe0148520bc95530a6cffb904b5dbde00af1d85e7d1c26b65
 AUX dracut-044-bash-4.4.patch 5036 BLAKE2B faf944f4405b560d7f43ce2fd0595b223f1c91eed11422b19a5b61b710e69c10b855d3fb99fd28f204d8c31c49c272259704e148fcb794bbd8309b3779a62b4f SHA512 68522464fb446175f967c8453e8427f961e97522661a22a7c302a90ff716ab75b0cfc32f568a06f1e1821ba7115d6d2f48b6ded9ed65b30806d4d505a0903279
 AUX dracut-044-preserve-xattrs-when-copying.patch 2354 BLAKE2B a7195fdf0663e71b5e5eb2f8c9d971f5bd2bdc8b8a49399d836efc8efed2547118399ae7780c93014659d88c0359e7336f2e2a345ce009b5f872468d0412aaf9 SHA512 b15babf62a4ece46c8b55a2ac21c3284665da8c38c10fc1209c08605b778689cf80108b8baa0ce66eee2218d6975cc5b9401d8a70326ddb6f731c55373e52a02
 DIST dracut-044.tar.xz 280004 BLAKE2B 5b9603eb769b542e2d56fae4d0f0fe250e7e60eb9c85f9c7b7a472b9d889a9f323b3ba1cbbeb1d5de10507498542275cd4430695cc8b48426b42c03d0672ea87 SHA512 bc788076e425b223d98cf0e0b15ff57d75d423991d7a67fb564a2857c38d5c3a21d846d2ca4523f9d4b0128bb981d09b5c26031435c5fc5e30f53080bca19b3d
@@ -10,5 +11,5 @@ DIST dracut-046.tar.xz 299520 BLAKE2B 1e2d848aa0db0e90734d8c60610a60b1f0ff67f8c4
 EBUILD dracut-044-r1.ebuild 7688 BLAKE2B 0746d8c7b1bc07fffceb5fd8e12ecffd663885396fe1d8c849977d4792e0f82ae4db517cc28aa1f676726f843a74cbdaead75305543bac19d99c2afe4cd74f73 SHA512 e82388ff89b4a9309f2e38c8d4cae5db63765b423d1066b978d7eb2b7374f355af49b3962ec22e4ca1a37fe699ed3311c610565f1218d249189e4f28a5677067
 EBUILD dracut-044-r3.ebuild 6939 BLAKE2B 6b9fa5193568f535d127d8001d71d3c257d49ef155082c29d8f876d4de51ac7f3139bf94cebf0dadc883a318f3a788df57a3ef7affe2c30e96d712ce72d0325a SHA512 b49f4a6dea1b6c03b6422b7c4edd7e655a123ca7074ebe38d98bc5ae324060cb0dda3cecbb8dd8caae5209d16d767680aaf4ec740cf65af496545b50c41d7a28
 EBUILD dracut-045-r2.ebuild 4791 BLAKE2B d4a0e55858981783182e43726aa790f824bca8cae4cf050695ac79da31adaee6c90379995b4317b0419fd5414906ffde17191ceff9d0aaeb81f8006b37977c31 SHA512 eccf8ac9c7b4384dd966f78121ae2f15a2bb0ff3ef4a3ff6b1259f5a4416058b3495cc21ae879cf674a59413dd3670b7ca2f4a87776a465077a238615ec1720f
-EBUILD dracut-046.ebuild 4767 BLAKE2B 1531a5ddf873d7ce597563f6049428e095450e0d79b3e2ab0d5565b9633605754b8dab76b5b8ac17f482b42239f63e3b568a39538fb5a6e9763876509a11273a SHA512 8716a1adb52a65ef2a77bb0c5aaa08e834e4fa5e5889e0b5ced2b34a72465196fc7b4a44ecd3e8a08366734d520e8af41dd1116a8a44d0bde1275a1bd3b97e14
+EBUILD dracut-046-r1.ebuild 4806 BLAKE2B 4af94a56e29f6ac94a7a9eed249a00e079c9dbeac907d4431c0451a3532f730ce9aa6d7945404f1d1b65f1bc43ad8d82807dea65374106483515362df68c01ad SHA512 120f2800883c02418e7dade4ce1fc04e6f7f405c53421740b88a569e21dfe1305e5683bdfb6070ce94c7fac156d4bedeeb59f84452c36ea3a27875a9183a30c5
 MISC metadata.xml 725 BLAKE2B 475d51f4e2bebf318ef94ea1fec40a34bcf04b4f0c69e051c8840e0965a92fd9861c5aa8acfb2ccb5a4cf354665ab3efc6adfdf7d0191325c1f798ea5e49594e SHA512 b708d0eb6a792d5ba3495f321af5e10672af3354f1f42c60b175b7fb48ae836e24db7768511c44cbb0a949c1cca75948890d3b32904bbe47e50d9c43d71787fb
diff --git a/sys-kernel/dracut/dracut-046.ebuild b/sys-kernel/dracut/dracut-046-r1.ebuild
index 8c505a56267c..501ca0187916 100644
--- a/sys-kernel/dracut/dracut-046.ebuild
+++ b/sys-kernel/dracut/dracut-046-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -51,6 +51,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
 
 PATCHES=(
 	"${FILESDIR}/045-systemdutildir.patch"
+	"${FILESDIR}/046-amd-microcode.patch"
 )
 
 src_configure() {
diff --git a/sys-kernel/dracut/files/046-amd-microcode.patch b/sys-kernel/dracut/files/046-amd-microcode.patch
new file mode 100644
index 000000000000..c351275dbebc
--- /dev/null
+++ b/sys-kernel/dracut/files/046-amd-microcode.patch
@@ -0,0 +1,30 @@
+From a1250a704e33c59f2395aaad054db1c745a5c98a Mon Sep 17 00:00:00 2001
+From: Daniel Molkentin <dmolkentin@suse.com>
+Date: Tue, 12 Dec 2017 17:48:36 +0100
+Subject: [PATCH] Simplify microcode lookup for for AMD CPUs
+
+---
+ dracut-functions.sh | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/dracut-functions.sh b/dracut-functions.sh
+index 112b2434..d7fc5303 100755
+--- a/dracut-functions.sh
++++ b/dracut-functions.sh
+@@ -661,11 +661,8 @@ get_ucode_file ()
+     local stepping=`grep -E "stepping" /proc/cpuinfo | head -1 | sed s/.*:\ //`
+ 
+     if [[ "$(get_cpu_vendor)" == "AMD" ]]; then
+-        # If family greater than or equal to 0x16
+-        if [[ $family -ge 22 ]]; then
+-            printf "microcode_amd_fam16h.bin"
+-        elif [[ $family -eq 21 ]]; then
+-            printf "microcode_amd_fam15h.bin"
++        if [[ $family -ge 21 ]]; then
++            printf "microcode_amd_fam%xh.bin" $family
+         else
+             printf "microcode_amd.bin"
+         fi
+-- 
+2.16.0.rc0
+
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index cd7bda16beee..cd544b941748 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,21 +1,16 @@
-DIST linux-4.11.tar.xz 95447768 BLAKE2B 5e6000e771f58baac2c4484fc8b9f83079aafdac03ea4f2a641bc025a0c79e789820f03b66ec852e28eba9bf3c5c9497a5a6b2e2aca13017fbd82d44ece97e02 SHA512 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3
-DIST linux-4.12.tar.xz 99186576 BLAKE2B 02d031c7f2f29849c06a6b5b589af78bc486a05a758267e47f2ff16844ae8ca701fff53cb859fcc105f7ea92c0769acf8d7f7cc116444c15235ef4d63cadc8c0 SHA512 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728
+DIST linux-4.13.tar.xz 100579888 BLAKE2B 2f8be07d403071b097b019c43fa332bc7d4805dee633a6fdffe5a99d5475015ca9e4881e7f4cbfd36f8c451bacf423436364ea3d9f25b8723a29a178dededb2b SHA512 a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
-DIST mips-sources-4.11.0-patches-v1.tar.xz 169588 BLAKE2B f1eb99c7ff5cf9a66c4ea5f28127cade4426ac8b98dfbecd63d00ec772de46805cbf79b9ec33f3ae9f64b791432f0505875ed36cffcb27c17b462ce46349e2a7 SHA512 de3a46f6279689155064c8f3232b34bc453b2ac14fe816276b45c492d1aecb56106763b76a445545521008ce32eb9d243213b1373900a6ea4579392b43b9303c
-DIST mips-sources-4.12.0-patches-v1.tar.xz 169476 BLAKE2B ea2b911338e19dd19e53c86f8427656438d8ed523d304a5772643fb4c795d25127f4c12000cfa6e65d8a2453ff305cfa2fa3a3963fb8c49dabf62f4c2bc0a660 SHA512 8c2dc743ceee4b6d57c0039f42c71212de836102f9ae23b4dfdf815e21bf2af4cad4382cc767d0eef091467c8a9a2d06ef3cbd47486e81d3d09f63728958ab93
+DIST mips-sources-4.13.0-patches-v1.tar.xz 170004 BLAKE2B ea5b8827c4bfb0d437dd27dfb2ab6451119527c1fd6bd8d05fe3384e22fcb6a58bf7003e04a9388f5f8a27dcb5e0a4dffa4bbbc2edec8a7c11b7760803ec3d17 SHA512 9c05223a5fe3853b4b9f07378c9c2f8f527ef41cba5111e52ca556b694811b47cfc2840db025fce233cb2909e3ab63bf8920583956552915e310532f173d9f14
 DIST mips-sources-4.4.0-patches-v2.tar.xz 156396 BLAKE2B 7b6a50e3768d7d67b525457a8a1b7ed024b3c8762e37734d250478bb0fc4d9d4c76598a45afcd239a5dc1dcf6052c24c69111aeccec11951093396212910c5a9 SHA512 4186ee382037ec32126976ba453f78fc80c627a4ebdd79d8462f12559eb06dce25f926f3c205c7c4e5032cb501942ee10c8cb3a17339352cec3cf565c669dd52
 DIST mips-sources-4.9.0-patches-v1.tar.xz 233620 BLAKE2B c976ddb9cc53c07c8c3077999a324746fafed3c7d913434d403baf08396196216aeb58ca61c434180e00a6b14ef939b3e86497236e44f9a5e1365357ea0f64ff SHA512 d786705277e1837f725c7b5a239a19744a7bdf8767c0ee75613270eb9592aeaee1cd0c6f05edb67abf93597d0f5c6fc3826d76847cd6b2aaa6cb21256720d19f
-DIST mipsgit-4.11.0-20170513.diff.xz 1560 BLAKE2B 9f6cb022db2abd808dfec12da2088fe5455465a9e7a8dede4a350ca85c4bb3eb798ee8205f8d0e99c98064ef84b5daae3ce7b930cbb1dea1907b3b620208264a SHA512 6adeda78012b26ebfdad577af59305756b8b090764c17e62cc988d884ab41a39e280371ccaebd9564fff4216b515b58cf4f02d529303f75e614b67e0caf84e06
-DIST mipsgit-4.12.0-20170703.diff.xz 1128 BLAKE2B a7449a035f1342b79b9b61512252945ff7714f64b6f576329312614aea77415db8d0a2a324681408927811a3c5f034170f4421511d3c93f07a354650bbc0f04d SHA512 9f811b3d039cecb024c12784d06a2f0e586443a0966d2caf73d2fbbd8cfe972b3b9aaf446f2728283fd08c1cbd9546dfa6536fd667cdc38882f1b84b61bcc333
+DIST mipsgit-4.13.0-20171007.diff.xz 1008 BLAKE2B dfbd93a92ff6a925223dec22936d40281e5a1054f9dcb8a3e44159d1ec6ea5c76e0ae57b2f50e92d414185ffa7b94749a9182c56589512208fdb57ed7d0105a5 SHA512 0c6244a7346018fbfcdab6537ee33931682c168a15c10f26f84615c29ea90ee77d6a4ca402109d6e5b66cd09c8925325a484dbfcbb50f8002a1a4d4ef4ab61c9
 DIST mipsgit-4.4.0-20160123.diff.xz 1908 BLAKE2B a8be92376d1360246359e8d3674fa30727363297d0f3c1f1fa41ad031235fcd59cfca3fa8645d2fd8ab34fcb79b49f622a28eaddd80da76cf23afc05970d7bae SHA512 0086c470064dd4e5c2fefd8161b70200475659fe925e68d374ff139b506147c39163f366be689bbb92a9aaf72e8c58cdaaaff5def6718c5e87ff7e047551a1f8
 DIST mipsgit-4.9.0-20161216.diff.xz 1120 BLAKE2B 1207d943aa39d157cf1ed87918082fe53c26e5342f8249cce1c21b47d38d9a33ec3fb024cb6358cb659e8630e58840d67570be731fb05e9124d86387793e045b SHA512 d1d8d95661d349826e2978d2259df9e30dbd6779a6506fe769dd8e60699e8461920b290a2064a432b8c3bd95888854f4dbcc2ba40929c58f0dd165fcb7894e15
-DIST patch-4.11.12.xz 298784 BLAKE2B 7e494b92a44fd2320ae91dd3a4860c37fe8ad543479e18607ad18142c3cbcda8b97ad11ad1a4452c9e1d239e71ca25d8565e237556abf7e72b21630a2852fb24 SHA512 ee9c5ac45896d84739c679834fcd15dfc46f9e939dcefd54ba049ac47168d71f0af680153615de002a2073ba79e44a9214f74af17ed16aa97d85e6df157fc6e8
-DIST patch-4.12.14.xz 237356 BLAKE2B fd8d61c114766765524b59ff994af64c6d6ae7434c2050d56a231cb5c6ea3c547eb75f5bdef91d058482324c6dd1c07e925d5071349e0bddf95abc18d20eafb1 SHA512 8bef19b2a87147b4ac7c5852d6cac0281c7df7deb84460c6462c981b9213d288061c19535bd9a4da03db73f8a9fd2fb76bf9c6d42b0b6ad1f30c97d5ee0964d1
-DIST patch-4.4.91.xz 1365724 BLAKE2B bcaaca82114db1f805e74fa7e92e496aa3cd3760b4e8fc1bf9d0b52f4ecb2816241552ee49cfbedf6fccccc08ba64bf557fb544bbbe4e7efed49243e99136da6 SHA512 44fab88ed7aba8f663ea01449fe7ce21e6ca0e472652dc61852402cf555ba9c7b9a48fa40a27e8da9612e9bf716b1e0ae761b6233363c6666fab8c7a54590bb7
-DIST patch-4.9.54.xz 1037212 BLAKE2B 289d3f84c1521f6853c4a0f2bf79b61c200281d50e2a5830b8a845fa34b516c917b7de3da7565721e25669f5411b7bb3c8bab2238730834978cc466c6100d348 SHA512 8ce2dbab8b8a94ef593eb40fc07b236c7b746a0eb099509fbe23ecde213384d535ad8ff4695b9cef2c5a78ecd6590fa8ded6e36c7ee17ef8dadb649ec5c074e2
-EBUILD mips-sources-4.11.12.ebuild 13150 BLAKE2B d4cd69e71d93971b0e543be12e7bd8ccee60f58024d1de15c71609183014d8a9d550f90e9d3f197020ca7094e2379ceb7207c6d605ac2d07418d4fa7afb7e59c SHA512 36598a045242c3471cc197050b472cd2cee553fb4498ea27739a2f5b140d32112b34ad95af1fc6e7c81983517974f9621ae3b152c04c2fd35032f663c4c87fc9
-EBUILD mips-sources-4.12.14.ebuild 13150 BLAKE2B 43fd533191b0a5c866c6789697ffb139ca6dd52ea8aca9321f342bc8418e7166bae1e2c0dbf043e1b6b79b18c5d6c437ff2bc2545feb0fc18af87be147b5011f SHA512 19abb9dba00896335f9bbe8b6dd00d32f39266918e482a78faaa1b101c25d54129998a6993f8f44081d86ff4b98cfb35b7b247d10ede95061b7b663296d56983
-EBUILD mips-sources-4.4.91.ebuild 13243 BLAKE2B 95df3b61b82e97d9a8a6ee920f75806465d6bd34992d9176242f5d93bd773d4788bc26cb6e757e88a218546ee10d68ccd5bc37bb0a57e02ed7a2d3ec5283a2da SHA512 d0b1a6416369d2770048c96cda0f27b58024d47acb7b8d3e26dea5e99ceed7391d8aac2fcd06db45053bc2a2bbb5ec397abf7fe9219d022ea9504bde19f8acd7
-EBUILD mips-sources-4.9.54.ebuild 13145 BLAKE2B 9b4391cb745b67bef558f1584db4c48ba1b16c35d5b692225a9f78800985ce8b0ef01956a8aa806b4e2efc6fca81aafe8dabf451947cd72163886ad544cce804 SHA512 fabaf8cb3c5e1429561c04c77a8e0dc1e5e69a5777f78b373353ecfc843cb8be78dad16842cf584a6906adbf8b2b908c036f885f568186636997d0d06592a6d6
+DIST patch-4.13.16.xz 271596 BLAKE2B 3ff4ae40c1ea5f9b547ff3d6bf59a065f84cdc66e9b6423b344c8fd7ea5ba96bd60e18861be64d2c6027b3b73fd30dcda99ada9b19f4a2daa8f7917fae0f1bb2 SHA512 6d9e6593477fb7aa663e6b9cdccb1d30df8d3bb3721b93afa9ddefce539d267bee062809dd6c50135ba113cf5220ef4b2799f25eca73c791ff59f4480189d211
+DIST patch-4.4.110.xz 1553352 BLAKE2B eb4e37d1deee89586db12a56dab415a985a678291b74fd4c0c5ded3214e47ca7f9019e572db79ed2d534f737dac01ecf065460c998de5e902b49fbe2d8631be9 SHA512 c247b8258d203448f5f8e0595475a4ac73c9550dadf2cd910c3179aaffb43cf11580647146e6e27d9fbcb33d869be91d4c206f3f1090492123973e3f239324fd
+DIST patch-4.9.75.xz 1339980 BLAKE2B 9f644981b4a1c173b505b9828a012417c0536732844ee9034e868b8679feadb40db5cfba1f1bffd31bb2f97960b13e3f682b01a27009d9fcca924e4dbe72d11a SHA512 4dbf9b7c6da142b63506542c0f1c5f0f3d4bb22c5291d4d99bcfc3945691ab5f969ce16b1d1a30553ba002feb3de66a9c39c1cf9c51a6c315e8820bc8853d221
+EBUILD mips-sources-4.13.16.ebuild 13150 BLAKE2B 2282d42810a3a08f26a4edded3b364a9fc704fdd9690d48a7fe8acfc2acd7405080b86f295ebf3c0134073ebaeae5dca5ad3c786d939c663611c2c9d0e44643a SHA512 5b60aae18f37390d715278753b97b39537061e447e526490b084108ff9bdf41471b48a91b89243c8ea1fba23d8f003aea2ecd4c2f9323c393c570fd7620ea89a
+EBUILD mips-sources-4.4.110.ebuild 13243 BLAKE2B 2e88921ec5522fe6a939276a8acfa4a21ac3ac25ddbe0ced5175358a5eebef1facab2c4cc941e8ece0cb4003366117c145ceefd56efb86922b026ad35019f5c5 SHA512 6a7812edd0bbfa9f65b0084a2b447f5185d597f635f90e306c377cc3b72f2be6b46d1e511cea1b47a3021b896e6f0297507dc19ea26a715a4bc57641e8e19ed0
+EBUILD mips-sources-4.9.75.ebuild 13145 BLAKE2B e1202b692eabf12cea2b5c81d2fd24fe2616fa4c0de9182c21b6ccfca78de1ebf32300fd2d0d9708153e73d09e0e67a2b2e926449fb01b822843af07904f007d SHA512 053284bbc06539cd1e3d21be171c8881898b2f24a7a3b1a46bbe93be0d9b0a08335bcb16fb456b80ec139f17a68d3cca861d3566e8998c9551d7ad88fadf672a
 MISC metadata.xml 791 BLAKE2B 8f6a800e1ce23fc8d8fa9a2e93f29c7161c30770ed2ed7345e1175d06a44298c645020317f6e21eac3d798edf4b2a72eaca8ae32207ad62c2e151e9d87c8cd07 SHA512 8a8f75a760d1ca13dc53038271236e16801136db499d52f97cedf0120077d06870750f51440f5cf765bbc8bc1cbc8745b354f467c582e219c58be3e700ee29cf
diff --git a/sys-kernel/mips-sources/mips-sources-4.12.14.ebuild b/sys-kernel/mips-sources/mips-sources-4.12.14.ebuild
deleted file mode 100644
index 109a0726cf3f..000000000000
--- a/sys-kernel/mips-sources/mips-sources-4.12.14.ebuild
+++ /dev/null
@@ -1,344 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# EAPI Version
-EAPI="5"
-
-#//------------------------------------------------------------------------------
-
-# Version Data
-GITDATE="20170703"			# Date of diff between kernel.org and lmo GIT
-GENPATCHREV="1"				# Tarball revision for patches
-
-# Directories
-S="${WORKDIR}/linux-${OKV}-${GITDATE}"
-MIPS_PATCHES="${WORKDIR}/mips-patches"
-
-# Kernel-2 Vars
-K_SECURITY_UNSUPPORTED="yes"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_NOUSEPR="yes"
-K_BASE_VER="4.11"
-K_FROM_GIT="yes"
-ETYPE="sources"
-
-# Inherit Eclasses
-inherit kernel-2 eutils
-detect_version
-
-# Version Data
-F_KV="${PVR}"
-BASE_KV="$(get_version_component_range 1-2).0"
-[[ "${EXTRAVERSION}" = -rc* ]] && KVE="${EXTRAVERSION}"
-
-# Portage Vars
-HOMEPAGE="https://www.linux-mips.org/ https://www.gentoo.org/"
-KEYWORDS="-* ~mips"
-IUSE="experimental ip27 ip28 ip30"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.7.0
-	>=sys-devel/patch-2.7.4"
-
-# Specify any patches or patch familes to NOT apply here.
-# Use only the 4-digit number followed by a '*'.
-P_EXCLUDE=""
-
-# Machine Support Control Variables
-DO_IP22="test"				# If "yes", enable IP22 support		(SGI Indy, Indigo2 R4x00)
-DO_IP27="yes"				# 		   IP27 support		(SGI Origin)
-DO_IP28="test"				# 		   IP28 support		(SGI Indigo2 Impact R10000)
-DO_IP30="yes"				# 		   IP30 support		(SGI Octane)
-DO_IP32="yes"				# 		   IP32 support		(SGI O2, R5000/RM5200 Only)
-
-# Machine Stable Version Variables
-SV_IP22=""				# If set && DO_IP22 == "no", indicates last "good" IP22 version
-SV_IP27=""				# 	    DO_IP27 == "no", 			   IP27
-SV_IP28=""				# 	    DO_IP28 == "no", 			   IP28
-SV_IP30=""				# 	    DO_IP30 == "no", 			   IP30
-SV_IP32=""				# 	    DO_IP32 == "no", 			   IP32
-
-DESCRIPTION="Linux-Mips GIT sources for MIPS-based machines, dated ${GITDATE}"
-SRC_URI="${KERNEL_URI}
-	 mirror://gentoo/mipsgit-${BASE_KV}${KVE}-${GITDATE}.diff.xz
-	 mirror://gentoo/${PN}-${BASE_KV}-patches-v${GENPATCHREV}.tar.xz"
-
-UNIPATCH_STRICTORDER="yes"
-UNIPATCH_LIST="${DISTDIR}/mipsgit-${BASE_KV}${KVE}-${GITDATE}.diff.xz"
-
-#//------------------------------------------------------------------------------
-
-err_disabled_mach() {
-	# Get args
-	local m_name="${1}"
-	local m_abbr="${2}"
-	local m_use="${3}"
-	local is_test="${4}"
-
-	# Get stable version, if exists
-	local stable_ver="SV_${m_abbr}"
-	stable_ver="${!stable_ver}"
-
-	# See if this machine needs a USE passed or skip dying
-	local has_use
-	[ ! -z "${m_use}" -a "${m_use}" != "skip" ] && has_use="USE=\"${m_use}\" "
-
-	# Print error && (maybe) die
-	echo -e ""
-	if [ "${is_test}" != "test" ]; then
-		eerror "${m_name} Support has been disabled in this ebuild"
-		eerror "revision.  If you wish to merge ${m_name} sources, then"
-		eerror "run ${has_use}emerge =mips-sources-${stable_ver}"
-		[ "${m_use}" != "skip" ] && die "${m_name} Support disabled."
-	else
-		ewarn "${m_name} Support has been marked as needing testing in this"
-		ewarn "ebuild revision.  This usually means that any patches to support"
-		ewarn "${m_name} have been forward ported and maybe even compile-tested,"
-		ewarn "but not yet booted on real hardware, possibly due to a lack of access"
-		ewarn "to such hardware.  If you happen to boot this kernel and have no"
-		ewarn "problems at all, then please inform the maintainer.  Otherwise, if"
-		ewarn "experience a bug, an oops/panic, or some other oddity, then please"
-		ewarn "file a bug at bugs.gentoo.org, and assign it to the mips team."
-	fi
-
-	return 0
-}
-
-err_only_one_mach_allowed() {
-	echo -e ""
-	eerror "A patchset for a specific machine-type has already been selected."
-	eerror "No other patches for machines-types are permitted.  You will need a"
-	eerror "separate copy of the kernel sources for each different machine-type"
-	eerror "you want to build a kernel for."
-	die "Only one machine-type patchset allowed"
-}
-
-pkg_postinst() {
-	# Symlink /usr/src/linux as appropriate
-	local my_ksrc="${S##*/}"
-	for x in {ip27,ip28,ip30}; do
-		use ${x} && my_ksrc="${my_ksrc}.${x}"
-	done
-
-	if [ ! -e "${ROOT}usr/src/linux" ]; then
-		rm -f "${ROOT}usr/src/linux"
-		ln -sf "${my_ksrc}" "${ROOT}/usr/src/linux"
-	fi
-}
-
-pkg_setup() {
-	local arch_is_selected="no"
-	local m_ip m_enable m_name
-
-	# Exclusive machine patchsets
-	# These are not allowed to be mixed together, thus only one of them may be applied
-	# to a tree per merge.
-	for x in									\
-		"ip27 SGI Origin 200/2000"						\
-		"ip28 SGI Indigo2 Impact R10000"					\
-		"ip30 SGI Octane"
-	do
-		set -- ${x}		# Set positional params
-		m_ip="${1}"		# Grab the first param (HW IP for SGI)
-		shift			# Shift the positions
-		m_name="${*}"		# Get the rest (Name)
-
-		if use ${m_ip}; then
-			# Fetch the value indiciating if the machine is enabled or not
-			m_enable="DO_${m_ip/ip/IP}"
-			m_enable="${!m_enable}"
-
-			# Make sure only one of these exclusive machine patches is selected
-			[ "${arch_is_selected}" = "no" ]				\
-				&& arch_is_selected="yes"				\
-				|| err_only_one_mach_allowed
-
-			# Is the machine support disabled or marked as needing testing?
-			[ "${m_enable}" = "test" ]					\
-				&& err_disabled_mach "${m_name}" "${m_ip/ip/IP}" "${m_ip}" "test"
-			[ "${m_enable}" = "no" ]					\
-				&& err_disabled_mach "${m_name}" "${m_ip/ip/IP}" "${m_ip}"
-
-			# Show relevant information about the machine
-			show_${m_ip}_info
-		fi
-	done
-
-	# All other systems that don't have a USE flag go here
-	# These systems have base-line support included in linux-mips git, so
-	# instead of failing, if disabled, we simply warn the user
-	if [ "${arch_is_selected}" = "no" ]; then
-		[ "${DO_IP22}" = "no" ]							\
-			&& err_disabled_mach "SGI Indy/Indigo2 R4x00" "IP22" "skip"	\
-			|| show_ip22_info
-		[ "${DO_IP32}" = "no" ]							\
-			&& err_disabled_mach "SGI O2" "IP32" "skip"			\
-			|| show_ip32_info
-
-	fi
-}
-
-show_ip22_info() {
-	echo -e ""
-	einfo "IP22 systems with an R5000 processor should work with this release."
-	einfo "The R4x00 series of processors tend to be rather flaky, especially the"
-	einfo "R4600.  If you have to run an R4x00 processor, then try to use an R4400."
-	einfo ""
-	einfo "Some Notes:"
-	einfo "\t- Supported graphics card right now is Newport (XL)."
-	einfo "\t- A driver for Extreme (XZ) does not exist at present."
-	echo -e ""
-}
-
-show_ip27_info() {
-	echo -e ""
-	ewarn "Heavy disk I/O on recent kernels may randomly trigger a VM_BUG_ON_PAGE()"
-	ewarn "in move_freepages() in mm/page_alloc.c.  The exact trigger cause is"
-	ewarn "unknown at this time.  Please report any oops messages from this"
-	ewarn "bug to bugs.gentoo.org (assign to mips@gentoo.org)"
-	echo -e ""
-}
-
-show_ip28_info() {
-	echo -e ""
-	einfo "Support for the Indigo2 Impact R10000 is now in the mainline kernel.  However,"
-	einfo "due to the R10000 Speculative Execution issue that exists with this machine,"
-	einfo "nothing is guaranteed to work correctly.  Consider enabling ${HILITE}CONFIG_KALLSYMS${NORMAL}"
-	einfo "in your kernel so that if the machine Oopes, you'll be able to provide valuable"
-	einfo "feedback that can be used to trace down the crash."
-	echo -e ""
-}
-
-show_ip30_info() {
-	echo -e ""
-	eerror "Things that DON'T work:"
-	eerror "\t- Do not use CONFIG_SLUB, otherwise, you'll get errors when booting"
-	eerror "\t\040\040regarding duplicate /sys/kernel/slab/* entries in sysfs."
-	eerror "\t- Impact (MGRAS) Xorg driver no longer functions due to severe bitrot."
-	eerror "\t- Octane is limited to a maximum of 2GB of memory right now due to a"
-	eerror "\t\040\040hardware quirk in the BRIDGE PCI chip that limits BRIDGE DMA"
-	eerror "\t\040\040addresses to 31-bits when converted into physical addresses."
-	eerror "\t\040\040Patches that attempt to fix the issue are highly welcome."
-	echo -e ""
-	ewarn "Things that might work, but have problems, or are unknown:"
-	ewarn "\t- CONFIG_TRANSPARENT_HUGEPAGE should work now, but there may still be"
-	ewarn "\t\040\040intermittent issues.  Additionally, CONFIG_HUGETLBFS must also be"
-	ewarn "\t\040\040selected for hugepages to work.  If use of this feature continues"
-	ewarn "\t\040\040to trigger random Instruction Bus Errors (IBEs), then it is best to"
-	ewarn "\t\040\040disable the functionality and perform a cold reset of the machine"
-	ewarn "\t\040\040after powering it down for at least 30 seconds."
-	ewarn "\t- Serial support on the Octane uses a very basic UART driver that drives"
-	ewarn "\t\040\040the 16550A chip on the IOC3 directly.  It does not use interrupts,"
-	ewarn "\t\040\040only a polling routine on a timer, which makes it slow and CPU-"
-	ewarn "\t\040\040intensive.  The baud rate is limited to no more than 38.4kbps on"
-	ewarn "\t\040\040this driver.  Patches for getting the Altix IOC3 serial driver to"
-	ewarn "\t\040\040work (which uses DMA and supports faster baud rates) are welcome."
-	ewarn "\t- UHCI Cards are known to have issues, but should still function."
-	ewarn "\t\040\040This issue primarily manifests itself when using pl2303 USB->Serial"
-	ewarn "\t\040\040adapters."
-	ewarn "\t- MENET boards appear to have the four ethernet ports detected, however"
-	ewarn "\t\040\040the six serial ports don't appear to get picked up by the IOC3"
-	ewarn "\t\040\040UART driver.  The NIC part number is also not read correctly"
-	ewarn "\t\040\040from the four Number-In-a-Cans.  Additional testing would be"
-	ewarn "\t\040\040appreciated and patches welcome."
-	ewarn "\t- Other XIO-based devices, like various Impact addons, remain untested"
-	ewarn "\t\040\040and are not guaranteed to work.  This applies to various digital"
-	ewarn "\t\040\040video conversion boards as well."
-	echo -e ""
-	einfo "Things that DO work:"
-	einfo "\t- SMP works again, celebrate!"
-	einfo "\t- Impact (MGRAS) console only."
-	einfo "\t- VPro (Odyssey) console only (no X driver exists yet)."
-	einfo "\t- PCI Card Cages should work for many devices, except certain types like"
-	einfo "\t\040\040PCI-to-PCI bridges (USB hubs, USB flash card readers for example)."
-	einfo "\t- SCSI, RTC, basic PCI, IOC3 Ethernet, keyboard, and mouse.  Please"
-	einfo "\t\040\040report any problems with these devices."
-	echo -e ""
-}
-
-show_ip32_info() {
-	echo -e ""
-	einfo "IP32 systems function well, however there are some notes:"
-	einfo "\t- A sound driver now exists for IP32.  Celebrate!"
-	einfo "\t- Framebuffer console is limited to 4MB.  Anything greater"
-	einfo "\t\040\040specified when building the kernel will likely oops"
-	einfo "\t\040\040or panic the kernel."
-	einfo "\t- X support is limited to the generic fbdev driver.  No X"
-	einfo "\t\040\040gbefb driver exists for O2 yet.  Feel free to submit"
-	einfo "\t\040\040patches!"
-	echo -e ""
-
-	einfo "To Build 64bit kernels for SGI O2 (IP32) or SGI Indy/Indigo2 R4x00 (IP22)"
-	einfo "systems, you need to use the ${GOOD}vmlinux.32${NORMAL} make target."
-	einfo "Once done, boot the ${GOOD}vmlinux.32${NORMAL} file (NOT vmlinux)."
-}
-
-src_unpack() {
-	# Unpack the kernel sources, update to the latest rev (if needed),
-	# and apply the latest patch from linux-mips git.
-	kernel-2_src_unpack
-
-	# Unpack the mips-sources patchset to ${WORKDIR}/mips-patches-${BASE_KV}.
-	echo -e ""
-	cd "${WORKDIR}"
-	unpack "${PN}-${BASE_KV}-patches-v${GENPATCHREV}.tar.xz"
-
-	# Create a new folder called  'patch-symlinks' and create symlinks to
-	# all mips-patches in there.  If we want to exclude a patch, we'll
-	# just delete the symlink instead of the actual patch.
-	local psym="patch-symlinks"
-	mkdir "${psym}"
-	cd "${psym}"
-	for x in ../mips-patches-${BASE_KV}/*.patch; do
-		ln -s "${x}" "${x##../mips-patches-*/}"
-	done
-
-	# With symlinks created, setup the variables referencing external
-	# machine patches and if a machine USE flag is enabled, then unset
-	# its corresponding variable.
-	# See 0000_README for the patch numbers and their meanings.
-	local p_generic="51*"
-	local p_ip27="52*" p_ip28="53*" p_ip30="54*"
-	local p_xp="80*"
-	use ip27 && unset p_generic p_ip27
-	use ip28 && unset p_ip28
-	use ip30 && unset p_generic p_ip30
-	use experimental && unset p_xp
-
-	# Remove symlinks for any patches that we don't want applied.  We
-	# do this by looping through all the above variables, and deleting
-	# matching symlinks that point to the corresponding patches.
-	# The remaining symlinks will be applied to the kernel source.
-	#
-	# $P_EXCLUDE is a new var that can be set in an ebuild to exclude
-	# specific patches by wildcarding the patch number.
-	local patchlist="${p_generic} ${p_ip27} ${p_ip28} ${p_ip30} ${p_xp} ${P_EXCLUDE}"
-	for x in $patchlist;
-		do rm -f "./${x}"
-	done
-
-	# Rename the source tree to match the linux-mips git checkout date and
-	# machine type.
-	local fkv="${F_KV%-*}"
-	local v="${fkv}-${GITDATE}"
-	for x in {ip27,ip28,ip30}; do
-		use ${x} && v="${v}.${x}" && break
-	done
-	mv "${WORKDIR}/linux-${fkv/_/-}" "${WORKDIR}/linux-${v}" || die
-	S="${WORKDIR}/linux-${v}"
-
-	# Set the EXTRAVERSION to linux-VERSION-mipsgit-GITDATE
-	EXTRAVERSION="${EXTRAVERSION}-mipsgit-${GITDATE}"
-	unpack_set_extraversion
-}
-
-src_prepare() {
-	local psym="patch-symlinks"
-
-	# Now go into the kernel source and patch it.
-	cd "${S}"
-	epatch -p1 "${WORKDIR}/${psym}"/*.patch
-}
-
-#//------------------------------------------------------------------------------
diff --git a/sys-kernel/mips-sources/mips-sources-4.11.12.ebuild b/sys-kernel/mips-sources/mips-sources-4.13.16.ebuild
index 0779ad415e0e..656f5f1012a3 100644
--- a/sys-kernel/mips-sources/mips-sources-4.11.12.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.13.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # EAPI Version
@@ -7,7 +7,7 @@ EAPI="5"
 #//------------------------------------------------------------------------------
 
 # Version Data
-GITDATE="20170513"			# Date of diff between kernel.org and lmo GIT
+GITDATE="20171007"			# Date of diff between kernel.org and lmo GIT
 GENPATCHREV="1"				# Tarball revision for patches
 
 # Directories
@@ -19,7 +19,7 @@ K_SECURITY_UNSUPPORTED="yes"
 K_NOUSENAME="yes"
 K_NOSETEXTRAVERSION="yes"
 K_NOUSEPR="yes"
-K_BASE_VER="4.10"
+K_BASE_VER="4.12"
 K_FROM_GIT="yes"
 ETYPE="sources"
 
diff --git a/sys-kernel/mips-sources/mips-sources-4.4.91.ebuild b/sys-kernel/mips-sources/mips-sources-4.4.110.ebuild
index ee4aae1d80de..ec5f5a516a58 100644
--- a/sys-kernel/mips-sources/mips-sources-4.4.91.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.4.110.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # EAPI Version
diff --git a/sys-kernel/mips-sources/mips-sources-4.9.54.ebuild b/sys-kernel/mips-sources/mips-sources-4.9.75.ebuild
index 36671f256fb3..06dc974cbd3b 100644
--- a/sys-kernel/mips-sources/mips-sources-4.9.54.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-4.9.75.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # EAPI Version
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index fd740347af2e..070c659242bc 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index 17a4905681e0..f4a7922c8ff3 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -5,6 +5,6 @@ DIST gdbm-1.13.tar.gz 891987 BLAKE2B f73cb89aeed140a584c5a8bce9c2324cc39a7647ee2
 DIST gdbm-1.14.1.tar.gz 894412 BLAKE2B e519af45d670ec4285ece01edc17770dcb0d77f12edcf2d3d4cb9580c6d2bb6d6dddb57d4f33490e11dc9df7cd08fd44ab7737b62271c5cfdc9485b90d0d4888 SHA512 a15d7acb0ebf459f4f7d262e5a05393a9a7c8e9ae906d12ccb3b38715de15a41c9254e7814555e2f9af306ef63b2dc68b5f9f6c7b75dd0db77e07a58831ff603
 DIST gdbm-1.8.3.tar.gz 228695 BLAKE2B 21b5833facb97fe937020d80b038c7b09e55eea6bdb9ec323d185a0980f235ff6a225d180d86d984469ce04a3f0266d20881f317f4339915bc6f61ab150ac2ac SHA512 2a01751ee8f730db563b4f52185c72f1c7a4f66530d6736f05f7446153be685ea0bb6ea1d2bad16ce31547fea879dc48507ff65ad35b0973df9aa385713b10d7
 EBUILD gdbm-1.11.ebuild 1887 BLAKE2B 1f6680d070bc540e8e476e0f8abcd46c09b98f4334465b544b4c9ee1e92da3855e792cbc78ddb7f54d1cc2e1c7bf0d619289252647a895b9bb6f7c7d017aa30d SHA512 fb5768d73a8a25cad8e6defeba0dd4ba788a2f339e697054da879b0aa600cfafa18ec5793a255bc5cc3066019c189bdcb43842710588590c2bab1c28c172d5d5
-EBUILD gdbm-1.13-r2.ebuild 1899 BLAKE2B 192a421cffd9fb725f9fc54c9a8e3d29497d38ef98923c3627eb6e1c98e6a5ba5e8b8881a670cf66046b32e26abfc25eedbafa4b86f86415a5ced7b6b3976df2 SHA512 711be0c544297d04b5bf8c091391aa31e9a61cf0b718b7503c963f7fa9caa99b1f52fb04daa895321f70e6bbef3215ef85fc6f3efd8acffa023790127bb514f8
+EBUILD gdbm-1.13-r2.ebuild 1898 BLAKE2B c2244bb4a06b15923bc5fb737dcc414485477defe3855c9d7e59b1535f8ad524a3181a5578bec2f9b7aad22c496c07b10d67ac443e9968ec9f43d178b7585cc1 SHA512 e30e4efcc13c34959e59c68884876645935c46901320c3e6321a5f7b1157c92597a6d717bd8be54588f2073aefa146200cdcf00dd889f511345790e21a7e1169
 EBUILD gdbm-1.14.1.ebuild 1814 BLAKE2B 339557b78ab19986e57618be547699e248ab20c0cd91abd1242f974798c364d396a63ac2889fee4d11090bd710aea395a8b40a5dc9e3b96f36575fff25d5947b SHA512 19037ca081722f22445d29cb704143296b17ef0d66f8b9af016f377f497892af04f2173534e0416cae7ba31dfd8211a7fd2ed688b89cd402ff86922d61ff04b5
 MISC metadata.xml 471 BLAKE2B d73a0a1493a17d9990451e721b5bccddbdc3cfb59af544b1cdd927e31c65795888b13c7e42274a454d7dd8762ba92c5ab94dae5af7389a67688e6b06840ebad5 SHA512 05f989aa1f1d2ca29d4084741af8465c3daa0713881130aeb8ba8ac65f89a8874d668a0ea32184ec404e19777aa1df9e8d2526fe2ce9a22cae8c08c608501d41
diff --git a/sys-libs/gdbm/gdbm-1.13-r2.ebuild b/sys-libs/gdbm/gdbm-1.13-r2.ebuild
index 96a8d9f1d1f4..757aecf801d4 100644
--- a/sys-libs/gdbm/gdbm-1.13-r2.ebuild
+++ b/sys-libs/gdbm/gdbm-1.13-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/1.13"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+berkdb exporter nls +readline static-libs"
 
 DEPEND="
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 6483462354d0..35e7d4b01298 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index 720f3d17e37a..28ec76c70c12 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -8,6 +8,6 @@ AUX apcupsd.service 111 BLAKE2B bf2ac8161af5b971642298c30b08ad78d289044bb2452bde
 DIST apcupsd-3.14.13.tar.gz 1935043 BLAKE2B 56d8fb9c6a055b20c2d99867e43b6a2d6ebe1d55c724d8a6701d9baa569a14f600cb03c6176380c6c42c46ac610f43136a4b52c47c8b86bc41966d4091481e95 SHA512 74f7763de268626e24f9dd99090b01d5bff35c2fde769039104105ec27941673d1613c41fcac11e3d97d2fe5c364bcc0459847fcba5d2f7f1aac85795d6d8570
 DIST apcupsd-3.14.14.tar.gz 1843409 BLAKE2B 48a3b249780064d699d86b658584aa222ce9f3b46a81209110b4684bf737cca7492b87b063154864ce76478f29f73cda83ab96b47f4a7aa7aa91e29a8abbf4a8 SHA512 c953bbf3e08f809748a7978a3952604176390d1cd276f187fe096d9bc3c8993b52127e8350c0363387da41318e24b4d1e00ea58df71f3bb8f50c9a5a64cd2d7f
 EBUILD apcupsd-3.14.13.ebuild 3990 BLAKE2B e611242fcc44531d17290fccdb3c15e03ae1812ec51cbbd0e1420188c038bd642368c996b88101cc72af66af37740a9f2e35174173271118724a1d5775199246 SHA512 2c93c8d8028304a348c6d0937e0629e39a894f699c2ab2089cd9d2472fb66210aeb01fbe187acf5249844fb66a0e525e66fe844bacdd89b15df700265c75a300
-EBUILD apcupsd-3.14.14-r1.ebuild 4087 BLAKE2B 2145a520b8703253f84e0a8452244651e1e5b3432949b910dba89483d51978052feb7bfdcf01ceec8ac1b6375dc5acf32da61c4a44959274dca91d3dae4379cd SHA512 b655759b05373bf0b0ecec7a073fe93509042167293405cf0b23767dd7d99878b4ce641eb66d0a46917780c7eac32ce24b8b9d552f11b87fa5574e164e99cacf
+EBUILD apcupsd-3.14.14-r1.ebuild 4086 BLAKE2B a38026afefc8b1f267665dde2f0501db92d084df65678fbed9ec2d8de70b1be447c18c872b96587b327811be087ae8dc8417dd79d028b98a0f483cdf0fb22d3f SHA512 60aabe67b18773e03fc3206bf6f09ff493545011bb85068d45eac3bc71680e584cfeca94acec835e5905fe1ac2ddaee0be914eb5cd5ff10f3e0bea57ee9527fa
 EBUILD apcupsd-3.14.14.ebuild 3934 BLAKE2B e52893798801b32aba0a5cf4c72d22436b700caa3f300b8fb22d85b32fd77e856cf1fdaadf2f5c927a9946943c79a5b01c4eda311e33525ee2a279643775cdb9 SHA512 954489ed80b948ccb1f0cbb480fe6a1ff87f3f1ba2643e8d6f1834e81a0c8cc46b98fae380a6f96c1b1c9824049fd000d7ff26cfe2c00fa80ea065745edd59e3
 MISC metadata.xml 1259 BLAKE2B ca28cef92e8edcea0aaeece78cadb43ad8ad836297d8e857540558877a7781922f50c05b018d1a9f7d0753ddfb0a99aff84d16051fdfe5f0d407b79509058a35 SHA512 ba5660026926c0334a47aa3f84bfc0a4ef745db2170a1d773547cf495101cf1274cc24d71d3afa46fa62ebcb49e0913e92e9a0efe4cb70a349f77538b7f60eff
diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild
index 216d03216811..c1e6e5c55685 100644
--- a/sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ppc x86 ~x86-fbsd"
 IUSE="snmp +usb +modbus cgi nls gnome kernel_linux"
 
 DEPEND="
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index ed2cb4784a67..93ab612861f5 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/linux-sources/Manifest b/virtual/linux-sources/Manifest
index a97ed036f4c9..1389c2e19cc3 100644
--- a/virtual/linux-sources/Manifest
+++ b/virtual/linux-sources/Manifest
@@ -1,2 +1,3 @@
+EBUILD linux-sources-3-r1.ebuild 659 BLAKE2B b93944c890122fabf04beda06400e63d2db48d0ed2c4724c572908e14b1fb89b680f732f9278b0cc94782dd714e93a647d599eb6699cec7e8f7efa44d61c7d13 SHA512 5d65feafe088006da046fa00b5513b74d521ad8442386f3fd4499145551fffaa67db31cdaea7ce11c60cdc587a234cef82277dd28ef54e53d2ba7ee4f9b0d950
 EBUILD linux-sources-3.ebuild 708 BLAKE2B 48dcb4bb9fa0a812c0a38b04a460e47eedf75c4db591d7dc396bc16d93209bb8d824fa920f989986c877ab16cba56e80a2515ee9b50e464bd64a0cc658b570b5 SHA512 d12e6390e7a5bb36826995b0e88f164e458e3ce19c0d9a6b26851a80b563616be37f57f53c1e27bff9d63775d3ffe499aacb915cfbd30ae8ee5733d585e99d64
 MISC metadata.xml 444 BLAKE2B d75ec48cf4e1cb32478b32a6f15c3a0e3e42c9e99ac53d73386916553ec0566f5b7004532ad7728f7b6637255508310234f75105f820a4e7251efca16d8eb51d SHA512 e97f24d20680fd1175fc34a17eb76a88da055a0b9ce0d283daf93d7ef65f79a3bdee48293c850f5ce51369810534feb24273f02ef5f9f7c2f33f716f3b8c3200
diff --git a/virtual/linux-sources/linux-sources-3-r1.ebuild b/virtual/linux-sources/linux-sources-3-r1.ebuild
new file mode 100644
index 000000000000..e3959f883fd6
--- /dev/null
+++ b/virtual/linux-sources/linux-sources-3-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Virtual for Linux kernel sources"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="firmware"
+
+RDEPEND="
+	firmware? ( sys-kernel/linux-firmware )
+	|| (
+		sys-kernel/gentoo-sources
+		sys-kernel/vanilla-sources
+		sys-kernel/ck-sources
+		sys-kernel/git-sources
+		sys-kernel/hardened-sources
+		sys-kernel/mips-sources
+		sys-kernel/pf-sources
+		sys-kernel/rt-sources
+		sys-kernel/xbox-sources
+		sys-kernel/zen-sources
+		sys-kernel/aufs-sources
+		sys-kernel/raspberrypi-sources
+	)"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 6f149e82f7ed..8ac6ed6c3da7 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/radicale/Manifest b/www-apps/radicale/Manifest
index 52127470cc2e..6401e1d3b5ef 100644
--- a/www-apps/radicale/Manifest
+++ b/www-apps/radicale/Manifest
@@ -1,5 +1,5 @@
 AUX radicale-1.1.1-config.patch 841 BLAKE2B a21d34a08108de5f90470def9239ed667063691c17d0bb000a0b07dfdef58888a6623c29e661b84bc7cca9d3b373dfa7ce8fd0e7e658de36a9bce5ef88555d8d SHA512 193a15a2d0a80a5518275aecc42dcb2c27c68bc7d98666ea3607ca1901d1d84fe8fa5a7f4cb10e83db1b00ca94f3b592fd0ed4fb8d3f2b57c66dc707f5fba3c9
 AUX radicale.init.d 564 BLAKE2B 370d68329a2507c4b96766597851f1c5de13df492422212df3739eb4a5444ce537cdd23ea5d630ae51795979d69f521054c41a968585ffa671d8624aac176e53 SHA512 670de8a2d0d5e29b68c1e177db20d13874722f2ac9d96e746e59cb47181e206b4d249a5f9c4411acf4abe49ec44d93cf452b9100470e5374f3fe8e3c0dc000aa
 DIST Radicale-1.1.1.tar.gz 47174 BLAKE2B 60b2ccff2a2c604becc8c4c40d106c467f43be93593471732528cf1939165451702aa6e0ed8435584eb1202072fbe82a9afecd292b6365143d095f784e7eecb5 SHA512 dc251d8fa4d347c2bbcf472b7a2da94d674f858a007fec1d74774cd1f3ae43eb2d5902ed45762638ec49546b8ee1f66446d07b50fc0ff6595deb67ea07f87af2
-EBUILD radicale-1.1.1.ebuild 1645 BLAKE2B ba108e9bc2a5617bd1abb5c788db74490b57583dcb4036bf9ddcbbc1ceae966f905faa4a02c35fc58cfa0ba69c33cdd4486660e3e31fbf60165a9a145263af79 SHA512 8448309d0df8c2e8eb191556bc7e654f85e06c114b98669207d2ca7c3e0e99137cf0a2953068f2380ffe7bc52bda2811d2fd74c0c3aa5abfd3bf1887ea88a5c8
+EBUILD radicale-1.1.1.ebuild 1650 BLAKE2B c6697561ad389acc18fd82185501621efdb6dc40cedfe80a926f46050806ac4fbe0ceb9d5e7637edf104778dea9891dcb580b848e51bf562ac8983cf0c42681a SHA512 8cbf22e414475d004c24f985930dc466a9960571790c1ee133573e994b2afb03ee00d5b6b29fd217e0bd0c8732d706f051d549add80941969c87d282b8bfbdb3
 MISC metadata.xml 350 BLAKE2B e2f087a4520fba1ea802662a7baa7299049c4af2170d5096fb320fe910ac5ddbff12817257fed9d18281a942e87b203675df173504a127c4f6c57aee3238b3e9 SHA512 3f8e0eecc8780b629878668cb1cbbb58ccc974f3467e2d919453233caae3b4d903ca191d7cc9b9d2f43d3f91583d734f7da04ac6f4f730b923d7e69bc271da4d
diff --git a/www-apps/radicale/radicale-1.1.1.ebuild b/www-apps/radicale/radicale-1.1.1.ebuild
index 8876986e631f..4d26a7cd7950 100644
--- a/www-apps/radicale/radicale-1.1.1.ebuild
+++ b/www-apps/radicale/radicale-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 84b727bfc45a..d7ca052fd8d8 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index ab4d2ede4185..6c8a43146c7e 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -13,13 +13,13 @@ AUX chromium-webrtc-r0.patch 972 BLAKE2B 1c49db0ba631c8e517a5b361e2882e7f00d9b01
 AUX chromium-widevine-r1.patch 428 BLAKE2B 07b5ab48a2233986f60c91192557e0454eab56248cdf378ae4d6fe99f239f95e89f28fd0b2b7dc36dd85557e7a5403d9a30a8189b7f56a9bae678831dfa49d2b SHA512 fe6b912bd8b3993194f71bef229e57d4c24f9adcf697172eb3bc5ee8d38967bf5fe5b964e9d89d23960d25cd3a6e53ce7714f81f0df1881758b611a66375e32a
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-63.0.3239.108.tar.xz 534294640 BLAKE2B f0f87115e91d7a2aa331cbab05475cac098f6ec37b8ca82b6a84911edcf0104a89557304467704911a3f3b3232d8a83d575bd545df1c31518e50c2563d83c095 SHA512 3cb7c8569d2d061f5abf4ad68d9ea1716a1b07bdf8dfa7b600d558d308374ff5dbda9f947e67e21186e3e716fe9524fc63e8eabd9eac1fa805f0eb7d994c32c8
-DIST chromium-64.0.3282.24.tar.xz 482195676 BLAKE2B fdbe03cd5ee936913300beba18faf2a14b07a28a3904642bb4aef076c69914e1d058bde076e8f093836c4b5c548b7aa33c292b283f2807104ee5f5ebf87d6c91 SHA512 84bf757cf7a5ce08f81c4d2ef7b628b4bc393f457b81df8d86a4420a5cf68b61e01d5add6c6b221cbaf19f85b411228770d2c821e81cd8b0c16e27a455a96dff
 DIST chromium-64.0.3282.39.tar.xz 482357636 BLAKE2B 7e7209aa1c4584210b552e82b29c57af549492c85e96204b15c3d27d9ed3c89b7109c9bc539709ecc7221147c2cd4957b6dacf18bfa358c2568175e39eeb4a84 SHA512 16d7c16b218fb42a1371fe105b87a04fce0397df0912824fd443667a1b93ee65b1b9f7c8c3007bea8fc241e6a1b6cb4fa29a4f37c83b3fdfdd8ed6a6523e6906
+DIST chromium-64.0.3282.71.tar.xz 482134720 BLAKE2B 691e33c396fde798985af96168a7b7aa92e3c90bc542c6e84df1b41a74ae0f8cb7364edfcf148db48971dabd5b2af422d884a36528b5549ec2fd52f5e6d7f643 SHA512 90fff36292898e47a2c47940efadc98b7099cdfdd8df4659b5e1ba327e26230919dc1e9e21a4496207cf88f9976d048dd2f200424224f2bc25e7ee9ab2755f06
 DIST chromium-65.0.3294.5.tar.xz 484687920 BLAKE2B 2d4d30ea83bfa0d5753eecd4ea735ec5d81097867b7c32c190853adee372c5032dac549c064fb22688555ef6231a3e2e43b274735883285f91a0a2d9c7a151ec SHA512 089bcc7eba7d5a2a964b5b6e94c7735653582cd6925325b9bdb2788bd4abb4b3cbc8c71f5c77004600864106a18da3fddda0adaa53ad54a96efe21498e45f23a
 DIST chromium-65.0.3298.3.tar.xz 485716108 BLAKE2B 185b3f683b2a732343fa5f98b24171f1d3cf2cf8eeb63c56efa7699f6b038d2a7eea4f9277b0b7ee2fdfa207a4f13edbaf2cc9a591a79ec4d058a131ce44366b SHA512 f1ed9a403036e87da7897f173eeb1aa71fe2650efc5ef5b98f814c7d4d9c879971597f9ded11324c86d6edc7f12f3bcf2786a6fb022e9697dbdb8eae086e18b7
 EBUILD chromium-63.0.3239.108.ebuild 19805 BLAKE2B c11e610a7f7f498e351d0250a2c68459fda3cdbd1c18abadfd61ef4fe88998125807de58b2e39b6f364dc8b165b1195d11e32b5eea8df14e1d28a08915e84a99 SHA512 d0c44d2057568e092f6f955946df78ef8579114b200b233b2b45d878cb97439bcba1dca78bf3ff40386b5bb4a9c7670de5bbcca34572094abc7dcfeb3f5324fb
-EBUILD chromium-64.0.3282.24.ebuild 20052 BLAKE2B 6c8983cbba2db73f4cf0d445f39f12dd9e9b880990f701ac695421e9bad1296431747af2b1d3d1f90cd2d21eaf96b910cd274b47bf571af03e0abdb71a1b30b3 SHA512 fbe825d7ceee78a90943c539cfcdcacd33808a7be82180b2397d2ef5c09732e1d40acf1d534ba76fabdad2175bed04e47d23a381b140fc4fa922530a91c93529
 EBUILD chromium-64.0.3282.39.ebuild 20150 BLAKE2B 52ac5f763b1d62a3fa0b22401aadd7a9988945dc2ca1b1631f56f5f82df00a66a563aa0ac2b9e7a5f186dbb7bdbb1f945749e1c8bdc74d22dd51fe1e5c112c75 SHA512 fc1fc03574c94fb0b2e2b4e4e13907fa8724f01b1cb1f11869610e417663b6867ff994ecd95e508dff8f4e95c8127f36431368aa1b28b695e175ef1c92e2257f
+EBUILD chromium-64.0.3282.71.ebuild 20296 BLAKE2B bc6034a184d36a0ab134fdde9091c0e8709f783feb8b95a64710ec0f5ad557b7c0fed3230daae093702b3cac8d5707b22925542574006d1d09c95aed5434559c SHA512 f317ffbec2ec19f1e70a16e50c183bd56fd6e7a30f61ccd74c3d94617b9ebcd1efa3b6b9b592c72a34deefd6d30ac741adad3c9fa8ab1f88bc1fdc70b73b857d
 EBUILD chromium-65.0.3294.5.ebuild 20338 BLAKE2B a992c3d16e340f53ed575941b7ec48c8a254286be84f468f93e45eab707f95e13dde6c70c67296239e83defd5a7552cea527057e9733020ed575dd5aba8d7276 SHA512 f5b8fa9c52c98d601c4d0848c51789c6cfb3e18f6e0de541add26ef50a78c32fab1e6adcb483db9ad0af35734e77607f010ece461f4f88cce18e4633fae3620b
-EBUILD chromium-65.0.3298.3.ebuild 20285 BLAKE2B 3473461e5dc5cc20aaa013961f1c0f3f7bb6ff688d5d297f5e2e4529a38669586fca9448069696176ace87c49f4ea1c7dcd7a462f22915caeba21c83bea6dcff SHA512 c7a507a8671ead8b27bf61d90ef7f45b84e6048f6c8cefb19ea99defd9e6760072085c9bbe399603f81c5b1253bcfff322345d13dfb584e9f2e960c43885ac56
-MISC metadata.xml 1336 BLAKE2B 77878a208aff8c9744fca1874e9f692dc6dd55484303274012288c01def548cb96e0d428125613c84f49966adae9702c430ff1ca61c7df5654d1fda4ac9aa22d SHA512 028de2d2f3068ec95dc586b1d5b40cc4f69feba6ca685038427c606005ffc1ede58d056b0502822be83e28217182adc5305e81a7de8fd49f3162250a476cc1a0
+EBUILD chromium-65.0.3298.3.ebuild 20431 BLAKE2B c710e8c3a20c4513dd8ab761657148e77484005fd026a809868cd747bfdd618a868da1d62e0bbaea0535fb2c1d4cf1c6b9d8c4e96945afe6edd31bccf94005e6 SHA512 2366ef2ebb02b8f65b43a0ac3cfc64321574fd49c1b72b88768ae424cd7ff6f9477621f89606a5a6517499c02b03682991a3f776f76a82eef28ec389c6b272cd
+MISC metadata.xml 1418 BLAKE2B 0fd718bd70dc0fa890bf7e0efa2f6a186df446617f36bb5e4689989c4766da4016b5325d8a81f8959e887fc182ff792bb10909b5724df8c4fcaade221b289d8b SHA512 1c68218f5cab5787a7524823975474065794aa18f8301e9efe066847b9a566b870a68a3768cee925a3ad6543fb182575043c1cb45e145db67382c502a535d039
diff --git a/www-client/chromium/chromium-64.0.3282.24.ebuild b/www-client/chromium/chromium-64.0.3282.71.ebuild
index 299b79320806..8ea5262c2e60 100644
--- a/www-client/chromium/chromium-64.0.3282.24.ebuild
+++ b/www-client/chromium/chromium-64.0.3282.71.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -17,12 +17,14 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
+IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
 
 COMMON_DEPEND="
+	app-accessibility/at-spi2-atk:2
 	app-arch/bzip2:=
 	cups? ( >=net-print/cups-1.3.11:= )
+	dev-libs/atk
 	dev-libs/expat:=
 	dev-libs/glib:2
 	system-icu? ( >=dev-libs/icu-59:= )
@@ -148,6 +150,7 @@ PATCHES=(
 	"${FILESDIR}/chromium-memcpy-r0.patch"
 	"${FILESDIR}/chromium-cups-r0.patch"
 	"${FILESDIR}/chromium-clang-r2.patch"
+	"${FILESDIR}/chromium-angle-r0.patch"
 )
 
 pre_build_checks() {
@@ -372,6 +375,9 @@ src_configure() {
 	# for development and debugging.
 	myconf_gn+=" is_component_build=$(usex component-build true false)"
 
+	# https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
+	myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
+
 	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
 
 	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
@@ -539,7 +545,7 @@ src_configure() {
 	bootstrap_gn
 
 	einfo "Configuring Chromium..."
-	set -- out/Release/gn gen --args="${myconf_gn}" out/Release
+	set -- out/Release/gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
 	echo "$@"
 	"$@" || die
 }
diff --git a/www-client/chromium/chromium-65.0.3298.3.ebuild b/www-client/chromium/chromium-65.0.3298.3.ebuild
index 331308682ad9..8094adaa8b14 100644
--- a/www-client/chromium/chromium-65.0.3298.3.ebuild
+++ b/www-client/chromium/chromium-65.0.3298.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
+IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
 
 COMMON_DEPEND="
@@ -378,6 +378,9 @@ src_configure() {
 	# for development and debugging.
 	myconf_gn+=" is_component_build=$(usex component-build true false)"
 
+	# https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
+	myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
+
 	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
 
 	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index abb4eb267003..9cfaf6c4be53 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -9,6 +9,7 @@
 	<use>
 		<flag name="component-build">Split build into more shared libraries to speed up linking. Mostly intended for debugging and development, NOT RECOMMENDED for general use.</flag>
 		<flag name="hangouts">Enable support for Google Hangouts features such as screen sharing</flag>
+		<flag name="jumbo-build">Combine source files to speed up build process.</flag>
 		<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
 		<flag name="proprietary-codecs">Enable proprietary codecs like H.264, MP3</flag>
 		<flag name="suid">Build the SUID sandbox, which is only needed on CONFIG_USER_NS=n kernels</flag>
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index a7e780261ac6..23ec53b03976 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 78104a2d500d..dad9918e0bb1 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -9,4 +9,5 @@ AUX xserverrc 45 BLAKE2B 768b6cce44df53b656776acb0c386aade3897e1d117a6673986a18d
 AUX xserverrc.1 132 BLAKE2B f914e41cf124fb4777cb6eef3cee5e7137336961ef5cc010288b5949fff59fcdab3d2f264c91fe05ae165b6bacd63ae8b13e58b51a149b637996db346790aca2 SHA512 3cc3b18cfc8076badcae62d098a0c3cc0b654ab691b9e7a64f456f5428f1afe1130c9c033b106cfa2e566de22cb75756d71368e3c0a7474b8a76f63c1f91a918
 DIST xinit-1.3.4.tar.bz2 165881 BLAKE2B 78e0b9e8fdb146e969014d726ac05e7f4cf14947aa6026642fbbe6a55eb9c5cb891f079281bb40b460f9b1373259e338dcc0615fbdda64da49b719980017b782 SHA512 ac31e4cac86fc5dd4c0e15cf37cb9ac470ef3ace4f86d0063c7e1091342fe64d41fcd12c1840bd8e1cef4cdd7f66bd2fa76bd4061641e9c70941d76d73d0df2e
 EBUILD xinit-1.3.4-r3.ebuild 1913 BLAKE2B af34d5eb73f8e99ea509c577c7560d44f11f8151dafd2371d91172c395e564605bd326f8da5610a34e1b2edaad4f58f09f208a38d1d803610b641cbbc651592f SHA512 59712d0dd8ff2e7637bbd3b72a9bc067d860247eb9bb8be603211d265a3c209d59431759cffee408e4104a5d28f07fe18349e7aab1858b18944b5b6ca4467e05
+EBUILD xinit-1.3.4-r4.ebuild 1770 BLAKE2B aff5f95040e5b78e49670178dbf5ba32cf80b437aa91857acd0c6590eb60cf39f4dcc460b16519d86ea05c08e2e0fbd670e49ee4dcb5831ef79cf7cca12ada3d SHA512 bddc5e4776a5b27533fb179aa4102618f8f6a9e9afc1202f962734f5854bd4e60bddac6141fafa297060b544b633be269646a8cb3b4896f0003e2e707d2930b8
 MISC metadata.xml 480 BLAKE2B 190a0b3a84e4d0d85e0928b964cb820599510c6c09a1a7c385b2f9b402a44478e08b48fce2d88216fe2fd52a3f35ec02d99cb7d738caf8a2d8dd6418e36f6125 SHA512 5dcfabd3eff26ffb33bd8ae8248cc3214c67a0fb10d5c214b2432fea7625b2555b29bb654d9712e8d55a081b25912da65ac367203fe529a860febc59fb91de55
diff --git a/x11-apps/xinit/xinit-1.3.4-r4.ebuild b/x11-apps/xinit/xinit-1.3.4-r4.ebuild
new file mode 100644
index 000000000000..ea3e115f959f
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.3.4-r4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X Window System initializer"
+
+LICENSE="${LICENSE} GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="+minimal"
+
+RDEPEND="
+	!<x11-base/xorg-server-1.8.0
+	x11-apps/xauth
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+PDEPEND="x11-apps/xrdb
+	!minimal? (
+		x11-apps/xclock
+		x11-apps/xsm
+		x11-terms/xterm
+		x11-wm/twm
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch"
+	"${FILESDIR}/${PN}-1.3.4-startx-current-vt.patch"
+)
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		--with-xinitdir="${EPREFIX}"/etc/X11/xinit
+	)
+	xorg-2_src_configure
+}
+
+src_install() {
+	xorg-2_src_install
+
+	exeinto /etc/X11
+	doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}"/Xsession
+	exeinto /etc/X11/xinit
+	newexe "${FILESDIR}"/xserverrc.1 xserverrc
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}"/00-xhost
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/Xsession.desktop
+}
+
+pkg_postinst() {
+	xorg-2_pkg_postinst
+	ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
+	ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
+	ewarn "any executable. When you run startx, it will run this as the login session."
+	ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
+	ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)."
+	ewarn "Here's an example of setting it for the whole system:"
+	ewarn "    echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
+	ewarn "    env-update && source /etc/profile"
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 72e0b9d01084..8720715ace45 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest
index 55c2826c4ef0..024c093ed345 100644
--- a/x11-misc/tint2/Manifest
+++ b/x11-misc/tint2/Manifest
@@ -5,7 +5,9 @@ AUX 0.14.6-sysconfdir-xdg2.patch 660 BLAKE2B deb073f781e2434e54d158e2ff2fe8482f1
 DIST tint2-0.12.12.tar.gz 469724 BLAKE2B cfb9eb702680e23f7f9c9b98c8853d1e059a4d189347496eaa9e667bb91852b66dfc451d310d0194971b03c8a68ba60a596b380cae046e3d34a75a65523f2bf6 SHA512 10a1f42df6a66f6e092d69cd0ea3d900dcef57b06391206d950a1d7f576a880829bb44d00828a030d3172184db238a22f205169c12cc32cf42c6321d61929a8c
 DIST tint2-0.14.6.tar.gz 466533 BLAKE2B c7308771e8a5a7d49410d99779ee54fd19b7d5b71d6c04eb3835100f74df5c12d692b50ce57a2a31f4956c09e404acd8cfd2bd1ef87e6fc55f21f583f5a13977 SHA512 eb1505bef932aa0cd0291dc762d3c9cbe760e3fea0684fc604aa3cae3f5ddf63e5b791db745eb29384e4732e6de09a01084f3ce2a92931b431cdf69a59b1f6da
 DIST tint2-15.3.tar.gz 500301 BLAKE2B b8b405f1c56c3de41f672dc02acef893b0650fadca9a4823c7b249661e8675e01c92c9c1588d32c2836596f34c4dbc1e5d2608cff3c75590d7eeac9e925eb874 SHA512 41ae8f8e3aac6fe55539c531889ec2883534072ad398f0693e4bfd39c80dd4c64d635a36e063f741fe89fd461f66f92adf6acdde553e0f8b169992d94dc0e344
+DIST tint2-16.1.tar.gz 534354 BLAKE2B 540287bd952ba8b54372d45055efe216dc4d9d192e33d6f83f2c734e97b9e350c7be0cb3e19d414f4e11c0bb7b505307899dea9c10ac382737a2507f7df4fdcc SHA512 c6319d5692d53e56c150906c32c794ee4237e06455efb68527b379b4ae00c48d996c63ea02ee6aefc70266335eb4cb08b4731556075c46d435b7861de6eefd3c
 EBUILD tint2-0.12.12.ebuild 1400 BLAKE2B 9f386182995036c6f99f279c461f26486d3ec05bb3f6fc4eb7e94f12c002f6a2404b3f408e2704f144d26949780dfc6c3686708a3a762479edc4ca5aa1cd3ed8 SHA512 97b0a093ba91d254201b1105524c5eb087d09589be1560f5adfd76da26b803da3efff44f3974e273d694086dc3f50693c6a5cae1798fd1e11be98d6942167d0d
 EBUILD tint2-0.14.6-r2.ebuild 1341 BLAKE2B 8a26bdde86b7c5c0b44e05c184c7f6f2994c1ba52884025032aa71058a6ea3a3f0a35ba0abe69429ba608dc389c28ba609d868bea58a6b4a6ad08981fedb1637 SHA512 a76155df865a0b6dd2c12709f42e2848b9330e51a0c55392c42caa76f017550a94343469b741cfbee375f527b711a8a158efdccf315f3917442f13fec91d19f7
 EBUILD tint2-15.3.ebuild 1273 BLAKE2B f481e61000569a5491f3d02a03fbf74d2e824ece425c38c6ebe2a9d342c53881ac6a53c02c962e783dd609d8cfa4d9ebbd34374f5e2226980c17fa92462a89c9 SHA512 661effd4bf12390e7fdcd08e363ae7d8dc8aa9d4388c65b7f0360d6f9529ac60223edfe0f993cf99edeffe7f002f8e0eab436c58261be7f77f9e933e17667c8e
+EBUILD tint2-16.1.ebuild 1273 BLAKE2B d5b94cf497e38af830142fb500bf3178d3143382e856fe9a08d31774e4dcaee0b396e5e1c0f669cdec34e632d23fc957a67c986b0255a6e3faf75f3bc2135320 SHA512 2ed8566ffaa82189d804d8a5ce891df27e805d3a3539c30fd832c8edf1a779b0e799747a23f9a3d74407453317f77d27c3432e22139c9e09257075f05bb43899
 MISC metadata.xml 789 BLAKE2B 95159a0de8a09e4381a7cccf494554faecd8ca1e20e3d175eeb1ef76015f7609a3fe6cbbc0208414b7b703d78339b0a8b643263766269e1e466506ee25a4cbe7 SHA512 e50c127a10ae89a7ec04c7b3a1d5dad3fd1ca89ac37b66378d8b24921d3ffe43ea4037182e20a624880be0eea527414e3727726e6799bbec4d46e2d3bdc934cf
diff --git a/x11-misc/tint2/tint2-16.1.ebuild b/x11-misc/tint2/tint2-16.1.ebuild
new file mode 100644
index 000000000000..f7cbd25ca6f4
--- /dev/null
+++ b/x11-misc/tint2/tint2-16.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils vcs-snapshot
+
+DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux."
+HOMEPAGE="https://gitlab.com/o9000/tint2"
+SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="battery svg startup-notification tint2conf"
+
+DEPEND="
+	dev-libs/glib:2
+	svg? ( gnome-base/librsvg:2 )
+	>=media-libs/imlib2-1.4.2[X,png]
+	x11-libs/cairo[X]
+	x11-libs/pango
+	tint2conf? ( x11-libs/gtk+:2 )
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXinerama
+	>=x11-libs/libXrandr-1.3
+	x11-libs/libXrender
+	startup-notification? ( x11-libs/startup-notification )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_BATTERY="$(usex battery)"
+		-DENABLE_TINT2CONF="$(usex tint2conf)"
+		-DENABLE_SN="$(usex startup-notification)"
+		-DENABLE_RSVG="$(usex svg)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/xvkbd/Manifest b/x11-misc/xvkbd/Manifest
index 04b045d59f5c..563d8f049adc 100644
--- a/x11-misc/xvkbd/Manifest
+++ b/x11-misc/xvkbd/Manifest
@@ -1,4 +1,6 @@
 AUX xvkbd-3.6-last_altgr_mask.patch 202 BLAKE2B d980f06b4975bf5dadd6e6e656fd3471fbfc651cfee7f4c118010b1c38d41f7597f7bd6d7e07e6c261f7fed0b07efefdfd4f09fcee38029f0047ed5fc2a1317f SHA512 d3d58b1ba3a7dc71a0240ba3240fd06cc1719ac35ab8f1b119f7d79823fddcdbe1605a457722ec75d4b74804f0a68ec221c5ec3d6c15bd2c4130ce96c01f771e
 DIST xvkbd-3.7.tar.gz 81645 BLAKE2B 9133b3b8e176034f2c39deb3ad9b334f553c834ba3285aaed59ab2a6f531c0184879c7bfe8c702313c9b0d4089883603c2f8430160f3c2af243705e5328b4ed0 SHA512 19ac5e78c34889d80571bb9feea65582fa413cdce0ba2f949840a08e70c900d720ca789d90d1118aa9667d32183b0f1edb33b7b0029ef5abb1d6faf058134385
-EBUILD xvkbd-3.7.ebuild 1113 BLAKE2B fdbc4dfa7daaf3c372a4a68d9e4f1adedcce5d2fd52130d5168f530beda0b40fe092579c5e3b42daffc034c81a56723ab423437a22ee3040197b0d646cdaf296 SHA512 e6043572ede687bb3b6be6423f92f4dfef0915193154b7210b4cb514baddef28453cf6cd3a761b4f51a32e7f1ba295f69c97f3da510790e6b577d470497db36b
+DIST xvkbd-3.8.tar.gz 88508 BLAKE2B bdaa3b31322ef2393298cb6987e4980536f3a6707df4016acc698a6713f25bff3e92cdecfcbf0c513af5cb8290e9b434fc61108095138c15cbbba9765ba856a1 SHA512 8a1ff96d90d1021bfd60ac6c251e62d68a65e86a1f1ee1fbdbf67344bdd07d7e1929a646e7e80f1da5f3e12e50c655e2be180c9ae4129fa7912f32aa5f40f5f5
+EBUILD xvkbd-3.7.ebuild 1079 BLAKE2B 95d3b4c8fe766b590e65afba5546df9ceef6575acf8038e7de2615cd4c35382e15b459d09d64c8ae8fa5b1ca14cfdbd9768a86289d99f6f125bba1f9201d42b2 SHA512 620dc18b9769695fd17f6f86b21e7370557fd5dd168cc4e8e46a7789f2f4551b439e18ed3e7ba3cbbdcbbe711311be381124bb7eab8cddf3e28b87ffabc9e493
+EBUILD xvkbd-3.8.ebuild 1047 BLAKE2B 18dfa77c061d685dd57e4fc4125fcd027750b621f08b390063ebe3ff6d357bdc88a6560bf24363fe81026c7a2c1d9808ecc14dbcae6b1bccd6d5080bcab1575e SHA512 27af2ff87194e37174f5c59aea7d0806b052d8a3ca23a5a0694dede46d4ea8eb9c085465c70a34c19385b4e8450c04f870f27123b7c2eab6f3ae0ede2c4aff78
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xvkbd/xvkbd-3.7.ebuild b/x11-misc/xvkbd/xvkbd-3.7.ebuild
index d171ff235802..1277bf4b7f60 100644
--- a/x11-misc/xvkbd/xvkbd-3.7.ebuild
+++ b/x11-misc/xvkbd/xvkbd-3.7.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="virtual keyboard for X window system"
-HOMEPAGE="http://homepage3.nifty.com/tsato/xvkbd/"
-SRC_URI="http://homepage3.nifty.com/tsato/xvkbd/${P}.tar.gz"
+HOMEPAGE="http://t-sato.in.coocan.jp/xvkbd/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-misc/xvkbd/xvkbd-3.8.ebuild b/x11-misc/xvkbd/xvkbd-3.8.ebuild
new file mode 100644
index 000000000000..04a518b10850
--- /dev/null
+++ b/x11-misc/xvkbd/xvkbd-3.8.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib toolchain-funcs
+
+DESCRIPTION="virtual keyboard for X window system"
+HOMEPAGE="http://t-sato.in.coocan.jp/xvkbd/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXaw3d
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	app-text/rman
+	x11-misc/gccmakedep
+	x11-misc/imake
+	x11-proto/inputproto
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.6-last_altgr_mask.patch
+)
+
+src_configure() {
+	xmkmf -a || die
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) LD=$(tc-getCC) \
+		XAPPLOADDIR="/usr/share/X11/app-defaults" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		CDEBUGFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake \
+		XAPPLOADDIR="/usr/share/X11/app-defaults" \
+		DESTDIR="${D}" \
+		install
+
+	rm -r "${D}"/usr/$(get_libdir) "${D}"/etc || die
+
+	dodoc README
+	newman ${PN}.man ${PN}.1
+}
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index d8e91c007db8..5bca394bc467 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/wmsysmon/Manifest b/x11-plugins/wmsysmon/Manifest
index c99f1890b49d..6c25ac8aaeaf 100644
--- a/x11-plugins/wmsysmon/Manifest
+++ b/x11-plugins/wmsysmon/Manifest
@@ -1,4 +1,3 @@
-AUX wmsysmon-high-ints.patch 489 BLAKE2B f891c418f2b5e0e6bc48e6c136d637e4ae6b126c21539143c8354b67e9e400b785ec78d03d657fa1322e8a448fc404f62f9f0a6a445265b7ec61a2743fe503ef SHA512 314e509c4efb55402007533696291b9c543ffa4cbff84c3252ea9b9c7d6147c49241002bbef17fe28d0d00e4b64a4e5484f0f62d9b32ba4e9b2b5449026f94f5
 DIST wmsysmon-0.7.8.tar.gz 23533 BLAKE2B 830edc78222e8997c6ee23bdd9fcb28729e9b80d92b07f70a53d841065b7377f5c450024c511b4faa92043bd45aa0cc92e89ff900d7d4a53d3c9f4b57b4e6e7e SHA512 b1afd176851e8f89896e39b55d24d6efeb97eb5fdbb9c181cb030320445f1d8b22d31073edc615e6b47b91fd133b381f00b612901c8b312e7da404a4746bb97c
 EBUILD wmsysmon-0.7.8.ebuild 669 BLAKE2B b5436d51b945c8f3f7aad49d3758fcfe90990f454631e0897e5651f1d4a668b7cf9a68de9c02a7dbcbb6de541857f0acf0e4eaf2dc62d5b8d213e50cf4c2f82a SHA512 8c6c58be81e81d3bcb0237ccd16a363c0d2b875f1da94bf5f1b45fe131b44f2e751ce066ebfec0ee320e24867ff3c627d33996b255f1be46a02e386f24cf4a82
 MISC metadata.xml 327 BLAKE2B 4e0749c3eaf7a3ed5650d48d9f9a80b4ad41a9e0093bc4a8eec9e7348dfdfe03448f5b289f723771f8a3d431275da00dadd6223438fd25e4127658d63027e775 SHA512 0824ce065280643b8763048643991328a88ed82d876a5b7216b506fd156eb575b182edc0335083f011d90d1b3749a0ca746bd2e9fff201c62657906133ad3a8b
diff --git a/x11-plugins/wmsysmon/files/wmsysmon-high-ints.patch b/x11-plugins/wmsysmon/files/wmsysmon-high-ints.patch
deleted file mode 100644
index 4ba89fb33212..000000000000
--- a/x11-plugins/wmsysmon/files/wmsysmon-high-ints.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile	2004-08-02 13:18:22.780070984 +0200
-+++ Makefile	2004-08-02 13:19:07.776230528 +0200
-@@ -3,7 +3,7 @@
- LIBDIR += -L/usr/X11R6/lib
- LDFLAGS += -lXpm -lXext -lX11 -lm -s
- #CFLAGS = -g #-DMONDEBUG
--CFLAGS += ${GENTOO_CFLAGS} -W -Wall -pedantic -I/usr/X11R6/include #-DHI_INTS #undefine HI_INTS if your x86 SMP or alpha
-+CFLAGS += ${GENTOO_CFLAGS} -W -Wall -pedantic -I/usr/X11R6/include -DHI_INTS #undefine HI_INTS if your x86 SMP or alpha
- 
- BIN = wmsysmon
- OBJS =	wmgeneral.o \
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 4d182d9b85d3..6fe480d2e3e5 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/xfce4-terminal/Manifest b/x11-terms/xfce4-terminal/Manifest
index e3b01a258473..92ba6465ec92 100644
--- a/x11-terms/xfce4-terminal/Manifest
+++ b/x11-terms/xfce4-terminal/Manifest
@@ -3,5 +3,5 @@ DIST xfce4-terminal-0.8.5.1.tar.bz2 942117 BLAKE2B b72f1f51837778a90b4f3299ed2d4
 DIST xfce4-terminal-0.8.6.tar.bz2 952859 BLAKE2B 7f6ed679eb53196d2665003cc2af7543c42c73679f91581ee241c4c1d3d4d34dfd8b78e2a8f3038514727d585b51a2ae11fe20a48a55e9d0b869c6baeb4ecf18 SHA512 96d9c3fab56ad9cd267bd7b33f4d8fb3831200b9507653a69e6872b673ca5e30adffc73ef2f73de6eb858a2817a98b781188a39a4c0d79298699711c49f8be97
 EBUILD xfce4-terminal-0.6.3.ebuild 797 BLAKE2B 3c6ac612d2a64b1073a1c0cc8c7a6ed5a6765695858ec76a8e96c4d8a38cf98d86778f90b7681eede18b4586c53c15c3c2ecae7623b33703c76ed88b11ebf819 SHA512 8f4e7bd5b0bf6a633dcb3de46cf428d6b300072a90e6b96dbae51bf3efa19a77a29b927b08f742f74ede0a0355804ed991e8d72c769f4ba0cfef5b7d31298ff0
 EBUILD xfce4-terminal-0.8.5.1.ebuild 747 BLAKE2B 7b1b10843d7a62af551b255cc9ee3be18b13f6adea9557a8906439da9199face5d944351da7aedbff02faf203159c35b31d28b8b235bc07dd9ddc0faf2515328 SHA512 7516c226517cfa1b55c447b259712c855f413ddaee16d252e101f9d793309fad42af7b1a731988f088db4236c916c21963c67aa06b425910fd088ff10a78009d
-EBUILD xfce4-terminal-0.8.6.ebuild 751 BLAKE2B eb929725cf3b4da909e0131bbd2908f6a94522a54251344d3d0239b06dbce1ebd369d9cc38349f2cd2223bad7bd86b71a960eb687cba88db5fc60ec8bd77dcec SHA512 e2c732131dc466ce8bccf83b5cca05a9a4530577aab534c1c835f2388670a187e914852a4ddf2882b963d799f4720e06fb2525298e1f7d724cf7b28d11088506
+EBUILD xfce4-terminal-0.8.6.ebuild 750 BLAKE2B 67e7533281e8a51f58a381de978e7a6f280a6fc97ada612a491353fa8e8f0d8970bc25085c4a23016095b001c242fa3eb0da2c5817c2c3448b48390d1b2eaffe SHA512 7009b8190515aa9e624fa41f3adf9c4a9d00d3dbd8d5bb9afcd8c8dc5996d093ae299e5f4b458d3a4364d90eb910eb403cc80e4e1a7ed10b2f45076303d5e01d
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.6.ebuild b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.6.ebuild
index 43b6c1ca395f..7d9ebe5891c4 100644
--- a/x11-terms/xfce4-terminal/xfce4-terminal-0.8.6.ebuild
+++ b/x11-terms/xfce4-terminal/xfce4-terminal-0.8.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.32:2=
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 845cc939032f..4a4f92cb0e03 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/xfwm4-themes/Manifest b/x11-themes/xfwm4-themes/Manifest
index d09043118a8a..796ee7ef1118 100644
--- a/x11-themes/xfwm4-themes/Manifest
+++ b/x11-themes/xfwm4-themes/Manifest
@@ -1,4 +1,4 @@
 DIST xfwm4-themes-4.10.0.tar.bz2 621206 BLAKE2B 42cc46f8b3ac4584f33273373a54f3b31a5ae7c3dd3ae0bee97b2d6e721fd1d6263964c90fdfb5f53fc1c8c138ff07b7c0b4000661ceea4f074a23788f74886c SHA512 5c77e9f1b4b1051f86696605d2fcc8ba6abbc667fc2ae48c5eb1235d62fb99e5171a7c8b9b662147e86b1f508fd8d723f931bd211e41675ab390ec0d7a5e1305
-EBUILD xfwm4-themes-4.10.0-r1.ebuild 539 BLAKE2B 1fb1e6dc3b93f1a9ba02aeefdffbf4a3105eeadceebb4a0e973c95e789766fecfe95fa0034a4bd1e20d652a2ffbeed39e8dae1c4e33261d3492b9fe2b81d5a30 SHA512 33a01f86733508cb75a03b643473a751f46871eeaba37349e7df55dd180940df3a40b29efc0f41146979ef1c62a33afbf8aaefd0b8fc55aecc40deae1c13e9f8
+EBUILD xfwm4-themes-4.10.0-r1.ebuild 538 BLAKE2B 8ea3ac4932dbc90df62c21ca8e27339fd0f397ba8987f4e8322208a0a2096796de17dc354586c5af943285568b18d766de4f8af8d909cbd80f726313660ef5b5 SHA512 6b357706249779654190471bec8c4ee3452240a18cf1430a4baec0073eb54d614872f6f4bdac783ae77fae55bffe89ebf9a299ca8982e5941cb8858f5e6305c8
 EBUILD xfwm4-themes-4.10.0.ebuild 550 BLAKE2B a667fb490a09fc2268034fc8e27ac490cffcb7ab766bcfba5d4f2095487f0d05e3ad2e00322219e478011a340edb027e157b8b41e264261f0d50164ab144b1dc SHA512 eae6f10c6b13e0b539a2e0c2e27325035dabdda2c6d95578f06f8f19c79d4dcd343073b0c73f72b8a46304e6c996b6f5f76b05a4cd39767b6ed89c2b2bb66514
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/x11-themes/xfwm4-themes/xfwm4-themes-4.10.0-r1.ebuild b/x11-themes/xfwm4-themes/xfwm4-themes-4.10.0-r1.ebuild
index 9e16dbcbdc06..abe25baf2480 100644
--- a/x11-themes/xfwm4-themes/xfwm4-themes-4.10.0-r1.ebuild
+++ b/x11-themes/xfwm4-themes/xfwm4-themes-4.10.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://xfce/src/art/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=xfce-base/xfwm4-4.10"
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index c6219fc9a8b7..11d207bb5d67 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 74acae396f33..e41fff20214f 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -3,7 +3,7 @@ AUX wmaker.desktop 206 BLAKE2B 62fe60afde032c1f37c5c818bc37a97d70605e041e539e922
 DIST WindowMaker-0.95.7.tar.gz 3238325 BLAKE2B 68a26e8b1281a4ff387fa87517efb46995e5339e2e6e7f71303d3e3e0d75316740d2458067dc4159f23bf1e1b4e1e0bfc22b1428ee4933e4d474a79a147baaf7 SHA512 9c1190503efdc58c11a90d5ba80796979cdc9f2beb69a6d233ffc8d531a54c877c5270841bf6318738069098cd488e5ab77ac19f661ac888e892bf05ac22d93f
 DIST WindowMaker-0.95.8.tar.gz 3253515 BLAKE2B 225dae9eb10f913931e129fdf78860123a14406ad8e61ba42fe4eadcf5d3f03c88040a2b982e74abaf79088f4a063291ccfb7b7d42f1bf211adb7b02c765a664 SHA512 6ab16ed4304aba20f0f3a4083adf63a47fa674ade7bc39aaa8aa6466c7842e3f10ab73af96e2afce0842b11c57a35eb69f43183a4044d8cd95d4e2a4d2c079a2
 DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449fdcf8a2841d6a7adf1ab6435857d89cbc4fda22bb62432a1bbba921267380d00a0cded718bfbd344bbb5e6207e59b76096 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8
-EBUILD windowmaker-0.95.7.ebuild 2929 BLAKE2B 68f7759d4f1a6de7883c5b70ad49037590852f5116f0faa60b98c62091987a46f3ee23719b53711bc9268a2124aa5b416ac977a23812155f93deaa8aa6fba6bb SHA512 0c58d269520c26045f1d64957de83c4890a7c4e150afdf47fdd55c5d279e6616e7f1af76bf2cb5d01568b3eaca553058c00a32ed4b245ec68dc59074363d277a
-EBUILD windowmaker-0.95.8-r1.ebuild 3078 BLAKE2B b7246f8e48a77465cce253b08b6a0e376188cc73bb066e9f8f11c5cfe669f38588a89836ca778db234d036ee60d9e4cabf72c807e1b82220677f595df547e269 SHA512 49111409b639da99ae4fd526569fb943afe6214f4ba043f06f5d5b7ecf6309b5755f46c0705580e4930e63ea7302dcfdbda38d2a0e576518bfb4a35e27759413
+EBUILD windowmaker-0.95.7.ebuild 2928 BLAKE2B 4de4877dde6b7fbb16d8c2cbbf7285a9214f2352a200baf261eb891f1f23ecd5389b079735482448fa6c4e2804bab2139fd3ebcbf293ad88786ff30a7e0c91a0 SHA512 3b79d3e51efd6707995d4a327b3cc720f3ad668bc990e4dad801ab38f9fdc15efeb1f90819c4119e365d2a346378a009001326679e18cb78a26da11b0c08d0b4
+EBUILD windowmaker-0.95.8-r1.ebuild 3077 BLAKE2B 847ad2c55cb3bba70d41fd87397eed1cf44c9496992813162971c92e50530040701f1b8437454105fed0871ca2c72c9c15428b53a862b6488aaac03515734361 SHA512 87d3427ee280f78f7cf675c54f82f637493b918806f28a9514ef24b1a7840189fefd15907b35d6bf828fdeaefd7725598f823cd8f64dcab0ab2140c576592218
 EBUILD windowmaker-9999.ebuild 2956 BLAKE2B e427220753263ee20a1cfc6eefe114ff8f9db8f51faf7acd111c6729c246cee0c0479c94fa7a6d8e5d80a25474885e5a7c9f695269274a43210dd44523424793 SHA512 f4f33e43b2bff957a446586e650c3a0f0c86cfbb288295fe80304928404635ad83a9ab354143589081324c621bb78d864136f0fbfdc4e2d0b068f637fc03bc4d
 MISC metadata.xml 587 BLAKE2B 6480b551cac2e643a59a9c80e66ad6db4168e992e409dea260297275e9460edafe6d9e19daf0bc75c22d2d0ffe4b43d91dc8c5630a26e68a48a1ceb4c50ae4e2 SHA512 6c84dc7cc81239d8acee4b155f91855a945b532e20c5c5d6a51fb1c85e2150f2b8013203112b9f87f8e72b888175b3e16885fb5ff81a5ada414ce2e556957981
diff --git a/x11-wm/windowmaker/windowmaker-0.95.7.ebuild b/x11-wm/windowmaker/windowmaker-0.95.7.ebuild
index 0fa2c0fdf2b3..2343a3d65cae 100644
--- a/x11-wm/windowmaker/windowmaker-0.95.7.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.95.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ inherit eutils
 
 DESCRIPTION="The fast and light GNUstep window manager"
 HOMEPAGE="http://www.windowmaker.org/"
-SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
+SRC_URI="http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
 	http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
 
 SLOT="0"
diff --git a/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
index 734904a7bb0d..0c1c68cce53f 100644
--- a/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ inherit autotools eutils
 
 DESCRIPTION="The fast and light GNUstep window manager"
 HOMEPAGE="http://www.windowmaker.org/"
-SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
+SRC_URI="http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
 	http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
 
 SLOT="0"
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index e8b0d3f747a4..c1b24ec3220b 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index 549aec42bf0e..fda85f38197d 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -3,5 +3,5 @@ DIST libxfce4ui-4.13.3.tar.bz2 705465 BLAKE2B 47879b7dc952c351eb7a6266346c784a90
 DIST libxfce4ui-4.13.4.tar.bz2 684065 BLAKE2B 1da875832683b5e06b8e91b4078be8122ae85a91560d7b1768cb8c880fcf5e1d7cd07d24927ae3325ba9c500c6c2cd30e717e517775492b9948add0711f5aa40 SHA512 c82d6ff7ea0da4fc0f664bab92f1e9531162996a26bb092e6ba651cfc4551732cbcd8023908d428b47906c17c331c14bf4804256566ca564befa218dc1194206
 EBUILD libxfce4ui-4.13.0.ebuild 1360 BLAKE2B b14202b3a918fb39b1e43d088c052985084beff37795faf8b5ebe0348fc52b7a9f0f7d3ba696ef35248b5d5ea4feef2c2269ae5579604e9d00aece5cbf321add SHA512 01c30f381debf19d8cd52f2986a42f32c7c5a2b33a8e7ce6f553d5dcb75bed66cab381441d3f2cb62de857c10183689bf94a0f5c9b65ace39a184223f2edee8c
 EBUILD libxfce4ui-4.13.3.ebuild 1555 BLAKE2B be7ee093914c26704d7caf560789741cd3c720b2771e50fc39563db763e217687b579236a52aae5c08d9e608f229f3e81fe7121a550153e7acae694b14d3dfb2 SHA512 a67b442237d9d9dbdb3515dcbb6522ac47f551992778a3dd1b0321d66cffa509e87a83abc92173f2fe528ba9832e2e00efc87f90198bd5c803a521fac42c3b61
-EBUILD libxfce4ui-4.13.4.ebuild 1732 BLAKE2B faecf0eed576913aaa34bc00819d56d259198bf51865a7b9fcb59c80f958abacc70e8b5388220831b0a60fea46963cecb14e11d1576644e073969ca61de48153 SHA512 2e1aebf310cfa9f008f7a830cde02777ab2abece4685783544d5f99f9e9f2fe26b5a810853ec289c894c018ac1603a716c32616b1db36485b7bade48aeb26292
+EBUILD libxfce4ui-4.13.4.ebuild 1731 BLAKE2B 65f5342e260112f7ad71dcff1a9e929e124e55f58e22b02fab32a9f49d42422d9f15ac0f9ef4f5db6ba6d6f548bfbdf454178bc08e9b3ada4c95b2015acef63b SHA512 3028b5e739f92f41425da9f4de8f92002e670e6235c20af58616f7522f0ec0d6e4b7c16ddbc3c63ae74126a440d68e76e0c1ed9ff4338bf399618329fa1b8694
 MISC metadata.xml 348 BLAKE2B b833ebf4da605db088c633bbd7e8a5747edbffae3671d6049154f89b6ecdcf3054624b5e17d55332f405608d57dd3022c1dd78b81376bd2d28c063291d32073c SHA512 f3894d3ccb668e76deaa0651414359838402d2b1e11fbe816375e6147f89847257008d5807766796fb1249217f6454a5f5896941e7ce3bc79dce09b130db4fc6
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.13.4.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.13.4.ebuild
index 5a6e1471dd74..434d7d003be3 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.13.4.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.13.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug glade introspection startup-notification vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index e24c52947dc4..24a6e727c56b 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -1,5 +1,5 @@
 DIST libxfce4util-4.12.1.tar.bz2 455329 BLAKE2B 5bf684805f22db977d776b2354cdfdb7485a887a45806c32870e4f80e22c78b3e76006236e96109de5e3136c4d323bcc77482069607a5793c506f4406166aa95 SHA512 0bd0fe23e9fa325b08559d2b783242dfc61412a8c7aa4e5a81e5262ebceb57a722aa515db12747c9de9804423f67e50805848e5bed328ba7d17e2737f54c2ef9
 DIST libxfce4util-4.13.1.tar.bz2 497192 BLAKE2B 56ec5929df43e2c430c45298a2f7634a539ef1f32598ce4cd038659c93ed5de4f28472f744ab03e3cefd040266c1e1bd415c8b4e9489be8f3930bd6df8d1c5c0 SHA512 1667cc22ff72920d3280725cb40c41f5fba9dcfcba8e357ba85548c7f254a67a3ef942c1b71f0ac5c3a7fe46c8c4cb559a06a8111aa71ce1f6824d1a1c2b5063
 EBUILD libxfce4util-4.12.1-r1.ebuild 812 BLAKE2B 5afb711da7661209708fa8aeb45092bb56171c9c766eff5fab0558c8dce6477cff218eb1711417ad7eda1f691150f061de03abc9eb71325ccc3c4273f64db0c7 SHA512 fbfc45a90a36cdcd34e500b5aef1c1c4719b1ff2a27526d652180de5a57b8949e96ac0f93d485369212697782834d0adba6b96b3776d3aec18a47a7b8560ba51
-EBUILD libxfce4util-4.13.1.ebuild 850 BLAKE2B 7b3274547663980e4862774a9c1d87aed8656b7640314886136ae500b3985e292a802724af8f0d4595c24e1bfdeee41639b62695d59328d1434c3be15ad08a49 SHA512 beb8cbe6243f987b464fd48c8c3ad861020c70a3207ce61b66116efe302e9413f4423562a8f91e2fa77af25f9c3b67301b6010a99aaee0db0af6fb96ee100686
+EBUILD libxfce4util-4.13.1.ebuild 849 BLAKE2B 874a906de3fc30ff8e1b3b63b460dfe8f04067b6ddfe1adaff340d14d2e920aff21f5781e5dc14b7942f5ef14dd57fb584f478dc3959783719584995912f21fe SHA512 9b6fe20c7df77c2580ac1c75b91faba06826e177217e37b1e34b734bdce08348848af67573c4ac43b2cd47c5e1c8c3cca8448f29482f069899126d52cf074345
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/libxfce4util/libxfce4util-4.13.1.ebuild b/xfce-base/libxfce4util/libxfce4util-4.13.1.ebuild
index a8f16f907299..d61362c4a5e6 100644
--- a/xfce-base/libxfce4util/libxfce4util-4.13.1.ebuild
+++ b/xfce-base/libxfce4util/libxfce4util-4.13.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0/7"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="introspection"
 
 RDEPEND=">=dev-libs/glib-2.30:=
diff --git a/xfce-base/libxfcegui4/Manifest b/xfce-base/libxfcegui4/Manifest
index c798de1078d1..ef36cf6eb2cd 100644
--- a/xfce-base/libxfcegui4/Manifest
+++ b/xfce-base/libxfcegui4/Manifest
@@ -1,5 +1,5 @@
 AUX libxfcegui4-4.10.0-no-xfce_setenv.patch 311 BLAKE2B d9f36277d02adf9fbef96bcabb70d16f85a1e6ac13f8134d89456fb3e49cfe1b7688091bdf215aaef6f2a9298eca115496ab509d566440e442f9533cd4dd8a55 SHA512 f8d12be9e9d126d3a3a822cab872fb9dbfe2d5e23e40b529c2a637e0365e5b481ff44d564fcda5de60948342b9c1367d51ae20ae7e0e5abd69296f7dd3ea3f31
 DIST libxfcegui4-4.10.0.tar.bz2 691012 BLAKE2B cce4f0a9587c10c1a226550ddeda8a9f00b5c1306ce11c329c914e4f3240f4fdb390beb7a1aa7049076767c26707b2570c801ebb9d78504694ee3542477882eb SHA512 32fe3be287c84d1816154c7632a87025324c2cb9d9524ef3d7813c3b3619ca04e4b70aeb47a3e0fb59090e43e124476988774a0dc5186ebc1a0ccdfe635cbb45
 EBUILD libxfcegui4-4.10.0-r1.ebuild 1081 BLAKE2B de2110eca3249d4354d2dafe0cd92de4ee921a100b8589fa08907e88e0db4383186beda5f05905c3640041d6f8ae531a97d0c126e968ef566c15633bb5beda9e SHA512 c79abfe75251a08b969eb7d833c236f15491d971445a84ab62a0ca95a51eaf4914a0212ddfabb9ad36822031dfe4d6cff173e62e67aeeb7c1d4ce29cfae21115
-EBUILD libxfcegui4-4.10.0-r2.ebuild 1273 BLAKE2B fa1e67edcfb72d6b23f72c5273aa8bf86a79d7662a1b855d18343ea4a6ce8d9c208b3b946c5b257a782a4669e888aa40b6533aeb0596c0c49a6f85a700df6879 SHA512 e25b42cdf9cb767e4a2050aff2cb4d1149b2f5eab69a78c67472ba78a9cff5bb6b0a4c7b765c74b05372f519618f5a9c07269dbd6c28ae835263f807d7e7f61c
+EBUILD libxfcegui4-4.10.0-r2.ebuild 1272 BLAKE2B 770a14848949860aace5c6f6a8d84954c6182a2a90093f4a73746b4607a10a68d8df979eae45682ba664f6cdb2e67fe2542f888487b32c91002b46c9346cd9dd SHA512 68a68cce741f54ce695baa1f9e77bbb63fc5af6beaef6ff334d135274480ab2d53b67f25a2fa7406fc55e04ba1d14442d339523d27443414f259d5dff66a42e4
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r2.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r2.ebuild
index d48e4e7be3d4..9799148aca1d 100644
--- a/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r2.ebuild
+++ b/xfce-base/libxfcegui4/libxfcegui4-4.10.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="startup-notification"
 
 RDEPEND="gnome-base/libglade
diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index dd8342581d10..161481e19b9e 100644
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -5,6 +5,6 @@ DIST Thunar-1.6.13.tar.bz2 1937341 BLAKE2B fc47188876e694f724e3f10a0c1e621b5cae4
 DIST Thunar-1.7.0.tar.bz2 2235806 BLAKE2B dfe81012dd0c8e760497f5c919bc2e7d4dd5e3fe78969776022f769b6332d15c9bbfadee8eef8eb5cb60d8e482ada9b7d9c2673db4252d6ae2adc4788e0d257e SHA512 28f88108a2e6c415f81363330eae6046e858988b06cf6fc4408043dc6225e229aafcc1ccd5245568fb8910594a42bc7917a259eebe3ba597f453c6635c8ce639
 EBUILD thunar-1.6.10-r1.ebuild 1817 BLAKE2B 6005a4b1583bf2ae8f67156a82db6f7506652afb6c572ed9608727adddedb466e4aea40b60906eb262d3764b9b3510a4d7dec9486511fb70d89b800ac4db219c SHA512 d888e8e5e7d00291d085b4dd1cbdfe96b55b5d26c3b6252d450b0d31729b0a21e5a251de49507416d4592e9913c7861d568398fb946c9e3613844a7f3ea88cea
 EBUILD thunar-1.6.12-r1.ebuild 2030 BLAKE2B b7f132c61e3ba532caf540d59f9ec050efc8c183fbb04f1a9963e29994869a4731ebf2ecc451c268c551ccb9249b942b43f468f9db1bbbfaaed498f7294b829a SHA512 6b3f91e3c2acf44c6f1475e253d1a7911fe735ecf2a9a1617d80415eb7789f95703cda6a92319c759f218969170399cd8cddcbdf7cbde434745a52e982cb108e
-EBUILD thunar-1.6.13.ebuild 2028 BLAKE2B 13d1b8cf948d01b72ec5aa436a950e102bbf6fc2043ef3d8bf2e2a94b8c287804a60d73129daf9ddc720eaac740a288e0cfb10fb6de156591cc6a8e098649b0a SHA512 81b5ea0c2d01e0c0c388dda3150c5719e8c292739b222c8c954c2f88848fcd91afdb182d73f967cd09a9ded073fd68369d528204f67482a827a6b8e6d741a4bc
+EBUILD thunar-1.6.13.ebuild 2027 BLAKE2B 1bcc295431c0cad73a260ab88c4a2237afb7df8c375af55bcbe60faa074fb9266da660ecc2bd39cb28614413ed4a8810d60dbf0cd5aced1f6c00f37d0d9942eb SHA512 4f903dfe4e4e5851c7dc26730fd193d11cf4a7ecae4be8c9a151116c72c3d9fb809532f662eebbfd80e39332bbc3b1bc64ca7bc924109ff70580d7676352a18a
 EBUILD thunar-1.7.0.ebuild 1988 BLAKE2B 4fc386292695b3ff30b1d674e64a10ec355ac0e6c5958559529fe09a88849c38c508d8e2c82913e6cd494de8c5f1549fa4740532b60790beac1e8bb540dc615a SHA512 39312349928a0803c8454d0185ddb65121f2b471da725dd39673cc032149cf3877197331339765db92986a054498a728c299e8b47771e91ee2ee2c911b82eba1
 MISC metadata.xml 372 BLAKE2B e681d80da66f68cf89aea0e932d2a2c3008e388abcc40f20ffe31e859dd677fdd002c37af8c71912e1836bb6d008fe2b6f838453dc5c1e944fc66e9216b3708e SHA512 3ecb379e314ff3f9c745b61707c6df0a912b1466bd56abeebdba0ee138e14ee331fcd61acb3c5b64ace4daa42cbaaec8331cc83d6ae5d0bdc1fa5a69a258ef17
diff --git a/xfce-base/thunar/thunar-1.6.13.ebuild b/xfce-base/thunar/thunar-1.6.13.ebuild
index bbd36a8fb4e8..c8befc8f31ca 100644
--- a/xfce-base/thunar/thunar-1.6.13.ebuild
+++ b/xfce-base/thunar/thunar-1.6.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+dbus exif libnotify pcre test +trash-panel-plugin udisks"
 
 GVFS_DEPEND=">=gnome-base/gvfs-1.18.3"
diff --git a/xfce-base/xfce4-meta/Manifest b/xfce-base/xfce4-meta/Manifest
index bb75e3c9c99a..c095618b8d0d 100644
--- a/xfce-base/xfce4-meta/Manifest
+++ b/xfce-base/xfce4-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD xfce4-meta-4.12-r1.ebuild 738 BLAKE2B 3ef2789e0ffa9144350818053d31de68d2943d80ca776a3ef87fe49a062a6ae9759e8c71b4b8f8d7bb12426a9c6a01baba7a9dff8ecdc4b4c1d195facf0af6dc SHA512 a2df8707141b89d128ef613b7ff652b68833c03ec2e3750c72c96c5d7a420517aaccade159e20c5e40564d1a0673b7de41a9f0d58fa88a173acc4244471d87e0
+EBUILD xfce4-meta-4.12-r1.ebuild 737 BLAKE2B 9b962b8aa43b836222733dbab6c3e79639f2cbcb2d6e2c6ecedca2cae2254e0edbea06240cfcc1cdf38657b6e0b7a61c957dc19227bddf631ba7682ee41ea2e5 SHA512 3b476f6624dc8e4a4a601c4411b819e70a7a7e0a0b5f5f708826dcc8c73ba183e85450345301ac5db3d0a93dc01932885ae2e4c160cf1e00decdaef5e3923dbe
 EBUILD xfce4-meta-4.12.ebuild 731 BLAKE2B 6ea560133fae85f9a889e9769558c585367f2b5c4818fc0c5a13383519531b1e6af29228e775dce640a9333c1dfb9e581861c7475d7fc2f49d765ae537474478 SHA512 14a380c6263df6bf6cb0215dc9b37e7b4a15e11b84e56978357a956b54d04a11fafea62aa4e64999a1647a8e7a7634684aedccd6f25c0b7c68fe6c7bd0724742
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-meta/xfce4-meta-4.12-r1.ebuild b/xfce-base/xfce4-meta/xfce4-meta-4.12-r1.ebuild
index 9d4ce88221c4..66bc8855e7a2 100644
--- a/xfce-base/xfce4-meta/xfce4-meta-4.12-r1.ebuild
+++ b/xfce-base/xfce4-meta/xfce4-meta-4.12-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="minimal +svg"
 
 RDEPEND=">=x11-themes/gtk-engines-xfce-3:0
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index c38c5683259c..880add200fde 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -5,7 +5,7 @@ DIST xfce4-panel-4.13.1.tar.bz2 1209889 BLAKE2B 385885cbace0da1dd85c797effb03871
 DIST xfce4-panel-4.13.2.tar.bz2 1231467 BLAKE2B 994aa5daf3e2c09c96dfda82a67bdd5f28dad1edb2ed85fc5c9ac5c314eb426bb6431f9ae9e3fc5b5ee49fd818255c7c2f6abd58bf323a1ac92d2ca520a5224c SHA512 d26ffd904bc2dc1e8b866215c6c07e1c4052d8c46378c33dd45c90833cb4e80c452b7dc5f8d7dab0cfe28657c3eb0f4cb620b823938f54f8eb1ae1e4f8077ed0
 EBUILD xfce4-panel-4.12.0-r1.ebuild 1043 BLAKE2B 1585e2784763e5e45aa0269063851494f29dae6fa4f1f96ed1c7357cb9eec50c38a6e10a5d47defbaec12b412bda9cc1baa48a3effdb64b3932c7ce5d50cf7f3 SHA512 e62be4a2bbe1b8f582ca5a79f6be9996dd2d781f14a1a0492e33c7ed9f275e73163c6413a823a46bbc94bd75baf8df0bdc7b0ca92a35b2d9c733c1f9c0ed5f88
 EBUILD xfce4-panel-4.12.1-r1.ebuild 1038 BLAKE2B 948263536b1b59fe969ec1b514ff026014d54a7177db0f27a98f01486cb5730dba68e3f57bf144f3ec3691e1454020abaf721678e301f0aa1a36ea850b06c5f9 SHA512 03de37918cea674b02bea1f1670904fc703af37b0590562245f753d90a5dcaf47e5ff6117f39c8fd71637e3d91b1867d406449d78a942f7c8808d150bf3cb2f1
-EBUILD xfce4-panel-4.12.2.ebuild 1498 BLAKE2B 790c0e3ddf4fde2c59d36637095a76251ae2a1bb5e0f205d3b6a45d01bfa71e204249aced13c239d1ebceff74c61846ad4805af0a7d06c8e923a35fd8616582a SHA512 47d28ee812c20880dd84cab1b1b95d9bc7960e59fd0c4bea5a67a9fb350296bdef0e93ecea36be2b17ac152d729158512d36f1376c73f1adfa81f477770e1817
+EBUILD xfce4-panel-4.12.2.ebuild 1497 BLAKE2B b15507a07a48512f7c23285dc25b3c943e840dbbda8df5fcfc1154324a00c54d0bddab46fc21fc477aa80248429f506d293f0ebf866f5ec285fef9d54aa195df SHA512 189f4836a0b32aa0303b6ee551ec727b62b02cb26c77fd9bb7330d07ab8e46bc2e4d20314d7e38a39f9fb6472f12478ed46be7f445d847afebb019df3d6348d4
 EBUILD xfce4-panel-4.13.1.ebuild 1203 BLAKE2B efd12fec4f9da9e9b96b98592882e177332099e015f819fcbc36e419a6d76c75cd50bfe17d474f3597f5c6f17f4074bef4215c7f8cd3084ef7987c0ccc753378 SHA512 fcba4e858f0b1378e35265ddb5b398cdac1074ce0eb2060f2d5d39d5832efed1ea73e34628d13d06defaf73723c1e908251541350744020288a564d02a6f5c63
 EBUILD xfce4-panel-4.13.2.ebuild 1332 BLAKE2B 5613eabebe9bb123d89daf27f0472089c98920b24eb918a2170cca61ee308c97663d9d852ff3011a8757c6e5232ecc1fb8f893efd5316236fbfc85f25c7832cb SHA512 30cc1b1f72f05c7ecf489ae451900c6fec6dde9540e176549d373b2f67673dce674beed4eded84fefcfbe195684d87c7c22b9ee57dadc32e67de380d94edb404
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.12.2.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.12.2.ebuild
index 23870c54f2a6..6b04f5d0a57c 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.12.2.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/dbus-glib-0.100:=
diff --git a/xfce-base/xfconf/Manifest b/xfce-base/xfconf/Manifest
index 0c16e2bdfd72..d74ca3232252 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -2,6 +2,6 @@ DIST xfconf-4.12.0.tar.bz2 542544 BLAKE2B 4a2e5fbdbc375ee97c7730b720574495b22cf2
 DIST xfconf-4.12.1.tar.bz2 564131 BLAKE2B 893210f19d743559b0879e9e38004400c8f8af0b6b8c72db4602360eee2ee7058f074e86f2f9e4397f6e728eae0148d3621424461d53e84ad768d7f0673ed08a SHA512 114dba6a78d43b25eebfd9ef78beec75391b0c77e736e66ae2b04fe97dc281f93d05467ddfdd63a5067f44de135347564fe55928ae7de72f0984339db411d77f
 DIST xfconf-4.13.4.tar.bz2 598700 BLAKE2B 05d4f7e360359e8d56b8a4cf6a39f22506113a758861fb730d9fb858f92554af3e28c49a21ceb246f8503087bec1032d430b16df999f7db22c56d3d3cb12ad68 SHA512 17c4c2ff4b02eef2d3040c21120e34863e4b38794d7670e42a31e4062a0ba0d4064d4239e8166a2c05d5d316773fdc96ae6098e78ab9b058b9c5a31f94c7f3dc
 EBUILD xfconf-4.12.0-r1.ebuild 1504 BLAKE2B 89fa42d9668ae163298936bebfcfbecf7cddd6e4fae1da72a8d9977cd5f7f252b0eefe83d243a777b07060e0acedfe8fde0a466906648ee3c4efbf844f3b11b5 SHA512 5b263c7ff5a54350f3552dfb9f51d075e2cefb506d39353073c2d747172158479ca855bfb2d07983f48b095563264ba6a780e586be531cdc1ff559bda87d8b8c
-EBUILD xfconf-4.12.1.ebuild 1502 BLAKE2B b7521a2116c645827da9ff369ef4c007700e637dca9c8dc9201096dcc7cb883521df9cc11ca2e2569ac0e046ccafe82452cd204dbd469fc3c6f45765593721df SHA512 eeed242c39b7f0ce14270e7bd2c21aeb875cac9bce7c35af56ec5d7e0af0f66b52966cb91e2ad184fe27bf7e0539aa98bd9e5f04cec1d6f3ab0b91d4617a38c0
+EBUILD xfconf-4.12.1.ebuild 1501 BLAKE2B 37e368c6c8b60ea1e4151087f6da18be613729f82cc012f18bb584a177f608d380a625111754238ff0a9830a14416c89dc3f865284ae289020f1044d8fec4d13 SHA512 a7446f35068e1992159fadbe53408b73c0d9b7fe288ea5cc98794947167003c1db72074db74e14d0ab738d5b9540c2bf57111b55d08c5a1722eb755fb217a16c
 EBUILD xfconf-4.13.4.ebuild 1614 BLAKE2B 35e383b99237f8e84def2b182c441dc109b1c7f207a7cd11de4d120055ed27a635221457fb3ba1ede4cdcfbb00d191a9e1df90b8e3fba975334b5115071a3694 SHA512 479bcf4cb0d7be46ca871186e1ed202964cdb1a6ad86fddb246773a6a93bfae5908ba409ba53c6254e6bf2107c1fcf5c04a2ade04c6b318d643633883907ccee
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfconf/xfconf-4.12.1.ebuild b/xfce-base/xfconf/xfconf-4.12.1.ebuild
index 89236f09b5ae..3ac436eea292 100644
--- a/xfce-base/xfconf/xfconf-4.12.1.ebuild
+++ b/xfce-base/xfconf/xfconf-4.12.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="debug perl"
 
 RDEPEND=">=dev-libs/dbus-glib-0.98
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index ed156d4839b0..511010508a4b 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -2,6 +2,6 @@ DIST xfdesktop-4.12.3.tar.bz2 1420704 BLAKE2B c8e17717cbb29d7e64ab234e57f5658ae4
 DIST xfdesktop-4.12.4.tar.bz2 1421623 BLAKE2B a18b891d639165d617f2701106dedb2f8577273ece5a4c93f6b5e1ef26f801304ea2014f21bd2821eb9bac9b19e02dd75cd4054a116eefd544f4d8e5d6968879 SHA512 29f170b96836298dc83e3c49650ab7e88a93c1a2fa1599d1d98f3b6c80c9c059748b76a821077eea39b5b4619998bb300ff17f06e88483a59bd5ae2b76d0605e
 DIST xfdesktop-4.13.1.tar.bz2 1485914 BLAKE2B 2b991b40317c9d92b53f357d674078598a7b17dd870155de8eb360fd9998d5376582909b57a93e00628a7dfd7e65bfea22b7f57b9373bab869296ef9b2973af5 SHA512 efe5ffe450f498ee0188a1ca5efd0ef340d73b5650060f18db4fe94ae9130dd27e41c6b30af2f90839e6c8272f3e270d16b86df64d595fe82169c26d624f806a
 EBUILD xfdesktop-4.12.3.ebuild 1275 BLAKE2B 08dc9a579a01aeba80bd7b53321501a8248438373f8fd7bdbe4eea01050338765a1a4ce34862b8a179c377a4edafec409700ab537f75ca0a58a6b596acb9a696 SHA512 57dcf79e03bc606f2cc2eb16000008ce272495ba322453283e441d5d4e831587fd121fdff0c9fef086c2ec6c49ba96bb02a705855d4cfdd6daae622da6816bde
-EBUILD xfdesktop-4.12.4.ebuild 1299 BLAKE2B 8c7bc09356fa55eab0bcf94e72dabb84c394ec179456a463739d8a9a71777009681cb0fa0c7e586c59069fc2ba4a4bd23af61c3b3cc8fefeef08c2870c7275e7 SHA512 5f182d621761a2ba6f860e8d21c0079e6ed197d700a9abd4f9bcc8f374fca0d3c60c7ea7d11f5c89fa9d78a81bf636f7e2d4464666a1273758ef93ea7250d75c
+EBUILD xfdesktop-4.12.4.ebuild 1298 BLAKE2B 5b7b5002342b0bfb1e27f6df373af5c94973759ca6b610059d540fa01de62fabc046b2b36480b61a705e420327ce469a1eaff1d897580806063b3d3a09341dfb SHA512 4bd507a16607453eddbffe35cc57fb5671b4f193b9aa650fc3c736c1d0efb7fc67c726b1a501dbbdb89529efa31b3c85a8dd3b44e7e53c6db8f1cf37cea80d59
 EBUILD xfdesktop-4.13.1.ebuild 1269 BLAKE2B 91c7ea39e8c021e64f07bfdd91edbc7fcaa4f2f1277a7b47a32e781eeb1270cfbfdb27dfb0685661b1abda22237f8899a54b54d184730bc4332d4e72819f794d SHA512 8df648b74234353c6e0bb4b6efe2bee271a2e4071416721cd927a2e8ae9ace3e99af1b5492b4347392ce5e0ac303568ea08c32015f1bbedb48c5f3921e0a1d80
 MISC metadata.xml 364 BLAKE2B 64544c9e89e370bb213647843ebc3c5d4ca08aa46564b02830ff041e74db5018d7503106cba4e7c1dd562f359649974f12b841e32136eb73e9d84ea0ed36f456 SHA512 3140dbe5320efba5393874f93b907ef2dff1cc8dd44cda7340abaf19dcbbd709beb7649ac72f1e9f92da546e010f966cd9f5d51b867c6df8c49332bf9de67dac
diff --git a/xfce-base/xfdesktop/xfdesktop-4.12.4.ebuild b/xfce-base/xfdesktop/xfdesktop-4.12.4.ebuild
index 19a0b16cfd2d..30bfb720b020 100644
--- a/xfce-base/xfdesktop/xfdesktop-4.12.4.ebuild
+++ b/xfce-base/xfdesktop/xfdesktop-4.12.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug libnotify +thunar"
 
 # src/xfdesktop-file-utils.c:#if GLIB_CHECK_VERSION (2, 38, 0)
diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest
index ffb46f080290..aec1f9ba5615 100644
--- a/xfce-base/xfwm4/Manifest
+++ b/xfce-base/xfwm4/Manifest
@@ -4,7 +4,7 @@ DIST xfwm4-4.12.3.tar.bz2 1191929 BLAKE2B fbe306d095fba0673be17011757b880bf66533
 DIST xfwm4-4.12.4.tar.bz2 1208874 BLAKE2B 60b584d71bc4696bae83897d80cd90d9c13233d1971c823eea6417c8020a0440dc0d648df4e11b27947915ca57130ea3bc7b588e902dc7db74945349ff9ac514 SHA512 a33530b08f094456c45ad7c627ba34d3772eaeacdc9f422a3a54a16194d494cb1d6798122398d917fb8bc970db7e1184d9dc8edefc365dacc86de22be397b43d
 DIST xfwm4-4.13.0.tar.bz2 1229878 BLAKE2B 9d7f3d6121a1d1522294a659204d391e120b971cbca00f53f0a0d37f256f2ad65dc6ac1cfd5355d78fa5bd811ed8f7d4013081a10470f18e3edb9fcc0395e218 SHA512 01c6cc31dc179ccb51f9881f64ee9e4e16320ab888381d0b203ca0b2a46097048c30eabe7083aaec869c80e8e358c287896d6a1965a36ed6f2f981c27cfb2dce
 EBUILD xfwm4-4.12.3-r1.ebuild 1653 BLAKE2B 54476d6f9edd45475975cc84952ec3f1fc9341e3e4ca2e83b4bdcefe0fcb6c3b923ca460ab3fb57308702c74f534f95117b7705085098554c0feba5190e6299a SHA512 714802fb890944fa5b321a59cda7876af66fdc7832affddbdf4a7c470ec108005dc248d4b8e021246226694e3e0eac249ba6100a60f074b5e7b08004f86c4ea5
-EBUILD xfwm4-4.12.4.ebuild 1521 BLAKE2B 96a37a062eddc4c525f7579b44f2de5b686feb937f5d348ee892051213646c863f7813fc4f040f8a67a315956145ee76e28ec07404091983a61406b3e986fca5 SHA512 6bab05fd2da1ab06d6efa5974b642dbd01233e3ecfb2a9188d070f3157788fea4e5bc0573ff5f1ebd54cf20b78589443f1acaee1a3d380922b8f1b526219bf01
+EBUILD xfwm4-4.12.4.ebuild 1520 BLAKE2B 52521fd323ce3cddc3ecf92da4057676f5b8c68f306c49391a7d8f1e5b51b979dbb928f64ee482e93dafd90c6fe2aa9a36f1ceaae815a851f833a9afeeb6cbaf SHA512 45ef48edcf38628b53251fd76456e4922f4c322749e72fa9c8b4c1adb672d53b67ea1cb4eedb3d606822fab9f44c9d7efd0be204ff013ddf9f8f0d727796153b
 EBUILD xfwm4-4.13.0-r1.ebuild 1741 BLAKE2B 4dad9fb930616e610be3a16b466fd5505e40be94dafe393d17e3412d27495c3119349422823761ea77c9876764f6ea8456b45b3afe6a71d0b72032126312eb1f SHA512 9dc3905aeaecff14847b34fd4d2f04e932688aaed8d7244ae9f3eaf5a6e2bfdbddd21ee66547c209f0ed787ab778590d90261b2766d25fb267d106d65894f440
 EBUILD xfwm4-4.13.0.ebuild 1687 BLAKE2B ae6177d167ba2b3608514bec0f38c907c9e4add0f39e404a197b3716074e047ef159d958db5f0cd4c0aec89024e1eac391ded0862b7ee8d885f4ac5bd2f21d4b SHA512 b979c9ebd4c7bb20815e7ba0bde6a67d7dd46bb74b652e473a24667680b28c883a85606561f22186d0f2a703414b429f2421b45cbeb1495e01e3a8986166e303
 MISC metadata.xml 336 BLAKE2B 7e0ae4707d98e66226f9572838507c6178d676c00d37b3beb7251a69459ae92ddf8e1061e9a6400d38497c14a22484bdf3e34aad7635f16a1cf4fdc6b9af2966 SHA512 099c7eb76cf479f56e499b979a2461c002088bac30838d46eb228a1810593453b95c26c4f9b0a4cc504fad9eaa3c8e73e5925e26886fff542ec3232fc425bd86
diff --git a/xfce-base/xfwm4/xfwm4-4.12.4.ebuild b/xfce-base/xfwm4/xfwm4-4.12.4.ebuild
index eab61d2a1c3d..454e91e0f721 100644
--- a/xfce-base/xfwm4/xfwm4-4.12.4.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.12.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="dri startup-notification +xcomposite"
 
 RDEPEND="dev-libs/dbus-glib:=
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index a0294cba9295..eb7bbbc518e7 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/thunar-archive-plugin/Manifest b/xfce-extra/thunar-archive-plugin/Manifest
index 0bb12d8ccecb..170864ba67e9 100644
--- a/xfce-extra/thunar-archive-plugin/Manifest
+++ b/xfce-extra/thunar-archive-plugin/Manifest
@@ -4,6 +4,6 @@ AUX 0.3.1-fix-kde-ark.patch 609 BLAKE2B db06f3ac161da82e534b60570a0890f1b2df96ea
 DIST thunar-archive-plugin-0.3.1.tar.bz2 329005 BLAKE2B f1cc88acb86565c001734ae2ead50f79cd4e922922292446b3775a7ef5cce250787b202ef6633d453b40bf37f1841d6e1b9ee34350e784587612ea0d4030e6d4 SHA512 51157c2680b3fcc6b541d35fc2943a350a0354d7d5bbb5fbe8a9dcbbeaf4bf4f5fe62521b8e9a73254f70bbefc440357deade8181313da96270c280eb0464e68
 DIST thunar-archive-plugin-0.4.0.tar.bz2 350011 BLAKE2B aebe828396e75701b788dd22266ed154b3a8296b8f6a912fbd99d4ebda1db2ed2a5cbf957a381523194270b5f1ea8ae6af24ca61e35b3953de54b0477bffd6cf SHA512 6590d8765ac6eab14fae7758e4c47c66b52e79e2e4b01a86d25bd35492590925ca35e4bbade8a9d8f0c73386eaeda6863e2a7a39a2df2904404f7e2bfdd91a44
 EBUILD thunar-archive-plugin-0.3.1-r2.ebuild 903 BLAKE2B 348e1e1af8e5d475d29e47018e325f8cb7116842686b66980aebd6c6e0138ea1b05ab4ff70c869cd82a9ae4eaede8c67f0d9c84565aa1a087e09e7b314ed0d52 SHA512 05b9071d114121a93e5eb86788bdcb4e6c14d991e3759d4128ded86804667d8282a203d9d36b2757dae49c0577bf803e17f8a71c727976320353f85932196af1
-EBUILD thunar-archive-plugin-0.3.1-r3.ebuild 997 BLAKE2B 1288460046e2a9ac6c780c9cf2768b482647d4537c9e90ce1524787dc28aa8bfd1753eafba1dec0a42b4fa65ca8ee6ced6ffe89fb9d10cc0aeeb857c4cf77043 SHA512 f99aca001727eade8b59afcfb2513a63837160f8028fa05aa86718bd9ebd4f44894e8781ae7fc2fe3ff5e561414852d309f5c087b42cbbb956345fd0127c4fea
+EBUILD thunar-archive-plugin-0.3.1-r3.ebuild 996 BLAKE2B e2e00cf8e9e08bee3ec92faf4e86f28a8ec332bbabbac65fae896f9787410244cdf2c8b770a714929544ea695f558b87eadd1c4d3ff48f4080adc5108cc78341 SHA512 40ace0a547a524bef87a8001d118d42193dcd60db622d160c873636d7288dd26149fcd74f855da56a8638c268f45598e34cd3605d8ef9d812c66ea1baf9d161f
 EBUILD thunar-archive-plugin-0.4.0.ebuild 858 BLAKE2B 1d42764967223557d411f9b958a9b1581b93fc935e79eae1585bc2728ad96cb3ff1f1d8b1c8a459b44b7c9198c5614d543089822eb1ff13c219f59f8b46e89b3 SHA512 bb7a8a18f967f8a6c83c04046a5899e980e8dd55375e725e4f3e353362ffe217e72d1dfe384d446fe1fb347f6ec5a2de3ce5c5c4edf2287fd8f19076be503d55
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r3.ebuild b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r3.ebuild
index 716af530f4ca..cf003b510759 100644
--- a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r3.ebuild
+++ b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/thunar-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=xfce-base/libxfce4util-4.8:=
diff --git a/xfce-extra/thunar-volman/Manifest b/xfce-extra/thunar-volman/Manifest
index 52e907a3522f..602341721a48 100644
--- a/xfce-extra/thunar-volman/Manifest
+++ b/xfce-extra/thunar-volman/Manifest
@@ -1,6 +1,6 @@
 DIST thunar-volman-0.8.1.tar.bz2 474769 BLAKE2B 2bf6378b35f0cd868cc7363909cc5d54a997a5a69758a27d45640968e3ef8d7cb3f5af185d1a8f83e8593610490a8566742070808ab85810cd3411856aa0030a SHA512 a82c019b028277d97e7903dcbeaf4704cb7fc1e95b0ea18c6290a7a8581355691990cbdb5fa0c234ed5dd51c1ba7f1bca9a495e60f9f8597a993845481113bb6
 DIST thunar-volman-0.9.0.tar.bz2 474533 BLAKE2B fff6292c7e613da47c32d92db9ffe0abd32ab2ba5c956c630208d2b3235d4f7a5e3aab5ddef291c0d185264afe6493566f4e5e0d73c60e093dd52567c5d5ff1e SHA512 d753e2aeded921e5652e6ace164845997dc3cdfbfd92561e2af822bffdf910a06850658a9f662198e4f7c485a3dc1226f97b573d28fb66e5ba490aa08f56a8f5
-EBUILD thunar-volman-0.8.1-r1.ebuild 1066 BLAKE2B 66272eaf56d1861234460dd779a09d24055e862a907518b138dcb10a21d701630883938a3f88d01d8ae3e127bdbd739ff6b2785063cb1a6a092ee74279d3958b SHA512 a455b7c7a184f585399ae05ef208727222d218cccc28537f7b881a523e63a3ee4cbd643b4ab84a17f2492f015f2c31335b3b346fed1864c08afbb3397f7047fd
+EBUILD thunar-volman-0.8.1-r1.ebuild 1065 BLAKE2B 1b756052456be5b260e58ef80cb15769d5690ceb4f94e7a36ae3661ef81a9feba606ae2c442bfd62ac81ea1d489f1735bd3332bcb56a70a5aa6b668b1979b0d3 SHA512 4150c177c90cd64e3930fd0010f8861645702286b15e6a6452fb253c7c7843560fe08dd5bcb15c71007e753a8053cb25d7f0a6f6f2c9a0f7650b623f5790d78d
 EBUILD thunar-volman-0.8.1.ebuild 960 BLAKE2B 1459a84b00c80e467c5d2855ba3ff6e3ea3257aaaa8cbe3e3d829e9317c248efc781e487e99247c2f7331f3f4a6d1b4b6231cfa2a9f97565e529465d76687eaa SHA512 5c3665fcfac947e6943ffc4bc668f7befd8bdcfa5496a4830b17cdf88da0dc9b29d6c4e23ed35b7cc41d3fe8303d45f8a4e68b31cbd7248cd407790a57f81671
 EBUILD thunar-volman-0.9.0.ebuild 1033 BLAKE2B 5d5137fa7eb5c3e9b90cbf0e363f081ce19d650a8ca7715f138795438a94b955e4f434b1bb6855484fcef442040cf3d1bd1ae5856597db98f4913564391503f5 SHA512 5bb418947cb406f65fe1469742d5dc33080b52a61ade1bda56b263be6024512e8a4e27956621c8673c734084a7ec2ae44ca9cddd3fe342f01a1e765b2a5f8651
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/thunar-volman/thunar-volman-0.8.1-r1.ebuild b/xfce-extra/thunar-volman/thunar-volman-0.8.1-r1.ebuild
index ee09b9a5c33a..b2216d9c417d 100644
--- a/xfce-extra/thunar-volman/thunar-volman-0.8.1-r1.ebuild
+++ b/xfce-extra/thunar-volman/thunar-volman-0.8.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86"
 IUSE="libnotify"
 
 COMMON_DEPEND=">=dev-libs/glib-2.30
diff --git a/xfce-extra/tumbler/Manifest b/xfce-extra/tumbler/Manifest
index 9e8709ea850c..6cc3dc2b8927 100644
--- a/xfce-extra/tumbler/Manifest
+++ b/xfce-extra/tumbler/Manifest
@@ -3,5 +3,5 @@ DIST tumbler-0.1.32.tar.bz2 535535 BLAKE2B d415af09da1acb223f7772c64c9273844377c
 DIST tumbler-0.2.0.tar.bz2 571300 BLAKE2B b4b923716897773febaff21c7d13fb8e4abfb36f9a0a02e4b777516ecd6170552d757057a228832924f4d8cb9f61380109ef52d0efaddcf69069ca5c0df4ae6c SHA512 54f83f904b32fcde5960f3343f8f4477bd30cd96a784aec5a3cb70aa2c9f924e833b2c0b429d608a36c75104d2689975d688358893127aed501f3cd8f24c280b
 EBUILD tumbler-0.1.31-r1.ebuild 1571 BLAKE2B faaa9e664761aa51c4b3244d8abcbfa34cd8594ccc976d0081bd10f52b39428f54fafe945f81b3c51a1d9ece1a17aed61468aa394b565029a5f32bf8bc2dc930 SHA512 aa9d1964a9d9833096a410cd6e4c048f74cecb53684635da7c742f816bec8f0c0e4655e7ffa505718cbf0f532e861206aef0ce7f14573dbeeba0ad2cbf0526b1
 EBUILD tumbler-0.1.32.ebuild 1552 BLAKE2B 423e01ddc1b73bc187463ff069ebcc5279f23f208683595f268fae7fa620cd53379fcac399aaf455ba749ee60b0aece147e3262c08d6737b6cf414a5b286cead SHA512 48696218fd7ff058eaa3ee89ad28ba7b24c62e16063791c66194eb86be7997bad663e033319674af95ebc7bde557de8e927ed8ad6b6fcfb531f1a73f5fca768c
-EBUILD tumbler-0.2.0.ebuild 1520 BLAKE2B f5cab682138ec5b03a33131867ee29ab13ffddef6cc726275494a4ef03ffb1d9ad63c108acfc5ab774eda32d960937e9af6b85a9c7dc4aaaaf9b962eb5121ca1 SHA512 a5ad3b58ab7da5dc40a54fd36d50a2f5884f68c405f96338ad236855e9b8b213da852bc37cf5b8096a76a455043082e0750be2cc15eed1bd371c7cd4cbd6bb19
+EBUILD tumbler-0.2.0.ebuild 1519 BLAKE2B 36b053c9972a497bb3295ac5c0be85e81ad2270f144bc114323b6ab5f0aa09e0863731bc4a0022578d49112c9b8ceaebe04325e02f90fb5906c36300051b579d SHA512 700d76f9c2b5563093f4b3e8cece5314b2482e401711267955b5d1878f9510213a284cb443fc23459dd1f6fa5c4edf72ae9198f43189cc0b979aef7098795c30
 MISC metadata.xml 368 BLAKE2B c50d2774a8ecb50f7eaf2436c89508d6b7b06d22b02be9e33329a152032ba500bc54e132280b3fef166ad824be432a75514a859c2da208bf2a19b69288809b79 SHA512 5adf546b54a71ff52292602144a8d459db2984115a88c893725d2101d2ef851ac855cee078dbf492f6a3b0c01980596acb1c2afca09fd68cbd2b1940ea06bbd3
diff --git a/xfce-extra/tumbler/tumbler-0.2.0.ebuild b/xfce-extra/tumbler/tumbler-0.2.0.ebuild
index 94d397ea82a0..314a5d1369a5 100644
--- a/xfce-extra/tumbler/tumbler-0.2.0.ebuild
+++ b/xfce-extra/tumbler/tumbler-0.2.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="curl ffmpeg gstreamer jpeg odf pdf raw"
 
 COMMON_DEPEND=">=dev-libs/glib-2.26:2=
diff --git a/xfce-extra/xfce4-clipman-plugin/Manifest b/xfce-extra/xfce4-clipman-plugin/Manifest
index ee15776108d3..4f5c298c2f3a 100644
--- a/xfce-extra/xfce4-clipman-plugin/Manifest
+++ b/xfce-extra/xfce4-clipman-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-clipman-plugin-1.2.6.tar.bz2 438346 BLAKE2B 4c1d780031e420f523dcb9472043614eaa48442b98d6d4daa342458f82a85f99670aa4e76259e89663f35af29a3f71964cd25daf449bc4204090b223b1b26ee5 SHA512 fc6b4cee1990ff13f4c0050ebf3e4b69fc0f7124fa2dd9b41933ce11449d322fad666b1af82bd610ce2add28d012a7dddc345be4afa1432bb330ecd6344a168e
 DIST xfce4-clipman-plugin-1.4.2.tar.bz2 485244 BLAKE2B 6e183b82db5c3325691d04afa110c4dd83b013a94ed9b3b1b1b7bbb4166bcb1176a6b4ed52fd0b3256b7f73816a0031ea6084f31344a9ac3187b7b5fd25f01ed SHA512 f12d9e3e37a26f9dade5b76e73ac3998030112b53e7ec7b756128f7f1ee28d19a1d7b8d4a26e0ccb69aaba2f0ab2f6c4cd5a435bd1cc7efd81c05b711480eba6
 EBUILD xfce4-clipman-plugin-1.2.6.ebuild 1023 BLAKE2B e07b8cab0ace9bec0fb690fe6ae4135ebad2ec743faf8b8513188cc46abf86e8aabfc4546cf25c63e09e5e2b5b922553c8ed14825e5d17e1b468bf89c256cc53 SHA512 7b68189d9046682f47e290d693a5fee2f1512677b6a940edb3c2ff9c814c8a3745e6b66258f13dde237d58b5c5ce90cf534d833bbb7fe0f513381751013d9dae
-EBUILD xfce4-clipman-plugin-1.4.2.ebuild 1132 BLAKE2B 1a4627f4182cbb5e1c4381b71b8d77c4acc1525bf52db053754a49cce383396dcb42079d85d6a1da248a97000c757421e9acf6295c16adc319aae2f8507859e5 SHA512 559b6eaa588a029e62f4042efd90e3b55b2e4caf5458ffacaba6c1feb799ea4ef50027a2b67d6349cda4ae0dee087b5e05b96158509160c68d1723197ea01a87
+EBUILD xfce4-clipman-plugin-1.4.2.ebuild 1131 BLAKE2B f7b138cf8d86c478a4905c7580baba9a229e99dc684a75e0153c8e265b7d45b0ff0e7a2035216cdb0dbf7cd8ffdf7e026c8ffa2156533b14b705ff5cd417f555 SHA512 4f16c17739c20df1bcc12b2b8bf09f7b27b679587966fe87990437f88577e6d361f2d5d3e98530630a7d1387c6ead38021d6b1bf8bd5df3d9038fd6e1d278f66
 MISC metadata.xml 344 BLAKE2B 2e5b2202a94c14c0b873c18bdbb7f02250049dbf45f23b82d44b2cb9fce79e7519a3fbc5f324b3c34f700ecf2314d051551283a5941ce16ff113b28f28852c3f SHA512 13ca7f9858f2eae8eaa1a4a43e371ab5b29433e1ac99ebe33d9678b7c3133d8e1639e146a93b6b4b1039278814d413d29e575a1a2784bbce0fcb50525e106065
diff --git a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.2.ebuild b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.2.ebuild
index cb2e59937c94..ee7230510d06 100644
--- a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.2.ebuild
+++ b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="qrcode"
 
 RDEPEND=">=dev-libs/glib-2.32:2=
diff --git a/xfce-extra/xfce4-datetime-plugin/Manifest b/xfce-extra/xfce4-datetime-plugin/Manifest
index bbf91748f7ae..817b08783342 100644
--- a/xfce-extra/xfce4-datetime-plugin/Manifest
+++ b/xfce-extra/xfce4-datetime-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-datetime-plugin-0.6.2.tar.bz2 287129 BLAKE2B df867af09c9b85b6a2b25c24bae071baff4f599ce15ebae5fbf0ad19451c38761119a50f63d3cdc3b3092e13a7ca8d2d82ca6756a836a4b0edc8bd084e109553 SHA512 53d7b28c125bf74479d4788b2cb9462d3d5252bca9ab4c615fcd98e63b2dd4b30d2492214b447169e0f895449051f1f001323cb0435e41365fd5b992283c4e6d
 DIST xfce4-datetime-plugin-0.7.0.tar.bz2 283142 BLAKE2B 6b65ab036a0781492b09c277bc1a9531edf5f197a98e83aa748579e58c1c765d9c8eccf860a934dd37fd45b8626e516e6deae8383a909c2335ff6f81a9663809 SHA512 a6d12a5f30fd6f5d0cfa85e50ed261c09378ff9f74897c5b30aef491c0f81a1985c033a416c9e080c1b07551666e1c6d1b1a1d75b5fac72dd71417ec23a640f7
 EBUILD xfce4-datetime-plugin-0.6.2.ebuild 770 BLAKE2B da3843e1c8edc132173f142f262f41d4c59e83e2ce0e5090b61c81d4a248a616a8d26f65e3c92a31d26eb5e369de6b3139d4a036c368c537ac99826b7e5e5e85 SHA512 7d89d897d74a68ac203c8eca30bbc2c424c8452472b3b0c5cc4c95ad2dbc7ba77be0e0a0182a80654510e8abb5e538f2e48e9e10d48325d45fb6a018402bbb56
-EBUILD xfce4-datetime-plugin-0.7.0.ebuild 964 BLAKE2B cd518f3604bb8e8f5dc9503e7d68cab225f6d26d6277cd7554d803ab91dc36a8bb3bc1e851a0b814d5e6aa1b4d0fcc37acfcadfbba168b6faab6b16b95b03764 SHA512 37a93a36bc924c9a57b6860aa52018b64752b9ed6ab9a933c7e5e130832941dd16d37fdfc3d685cdcc6effae4cde974e111e1c5bf382a590d61ae0f226e15f97
+EBUILD xfce4-datetime-plugin-0.7.0.ebuild 963 BLAKE2B f1c778103f3dadbed7c90e9fb73c8b0b1b18d701ada3b8b37e6c4efab97b7aa288221dc7a1e99447a93e9326c1fa398151813d7a843a0fd0977293d851999225 SHA512 9c206ce367477117b27086bdabf652464081bef494414d923f5ec7dd4cb075b8ec6de7c017b2502cfdabf7a1be3ef931a58543d4e28a8d2f836e834fd42cc51f
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.7.0.ebuild b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.7.0.ebuild
index b96a711e4e61..2387e19629bd 100644
--- a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.7.0.ebuild
+++ b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.7.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
diff --git a/xfce-extra/xfce4-dict/Manifest b/xfce-extra/xfce4-dict/Manifest
index 49d37f654ece..f4c11388c6d9 100644
--- a/xfce-extra/xfce4-dict/Manifest
+++ b/xfce-extra/xfce4-dict/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-dict-0.7.2.tar.bz2 489918 BLAKE2B 2156e07375fc7c97ee99163a5aa74180235c1d94f11f2d100b28747cb399a71b67d11d4ceebbf2d61545c457f60e61f2984affe9777b97eacebbc663415e16fd SHA512 fc2f254fdf56cc1d736dda6ee1d8df590f7513841923533a2d220afc5a514395839e330f277e315135343df53eabd57693777062c80f08fd5827a00cd90fe090
 DIST xfce4-dict-0.8.0.tar.bz2 483618 BLAKE2B 8365fe96710b6350be350fff0479d71fa2d2c85403e4bbb3e759cdfca9e4ed22ccd5ffcffa71f6ae6ca43e79cbd9c6d25bd675603ffd523fc7782d5040208673 SHA512 96e59b21b91352970e33aea84fe67fa9bce5f1fab47d794a129ec68285bd03c5e26a02b03519b1834d08a15c2cb54fe3d91c64799a8df283b89f304800024cb4
 EBUILD xfce4-dict-0.7.2.ebuild 822 BLAKE2B 82f56d2d8289e09371e39709feed175b30ea3a6a2d06639c20e403b6e8b4c87d4994f9ceec84bb8d95a6af67793dc9e4d98b7a50d8d0f5e0fa0986e77203fba4 SHA512 0da73513574620ba413fc06757eab6f9a700a11527389678e2ef01cd3239122897a08e5894296b0aa8b1c38b035744b74cf88135e9b31b638b87dc9c1968bbb3
-EBUILD xfce4-dict-0.8.0.ebuild 1008 BLAKE2B 249ad772f06036b2a12bdbe6e52ab99183d30228bd7640a54260ffca0ffcab201d7189378d951dc09d4f3d6e0063c17d9f889b59884589112292076a6c36a053 SHA512 9577e8697c6daa645a561211a54bb9662acee0fecc6e3322d2212f073e2da97b1e5a3305e3a87ffbcf9daf2896df23c3b3fba67987b6ecc2a997032eb8e8686d
+EBUILD xfce4-dict-0.8.0.ebuild 1007 BLAKE2B 8401cde5a783464b4a40485b22ef416b1e190151cbc98d5811eb94da00fb2973fce13e445863a597df3455c06859041cf14ec4216db330649fd035dcab9cbf85 SHA512 e337208bc94c0368a9aec5a9722c6af737bba40406dea7aab0c62ce10373c202c5935865805266795bdfcbdf3228dde9e48ed8bce90bae78f4dd97dbd4a09095
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-dict/xfce4-dict-0.8.0.ebuild b/xfce-extra/xfce4-dict/xfce4-dict-0.8.0.ebuild
index ef71f00df23c..a8b4c57ff2c8 100644
--- a/xfce-extra/xfce4-dict/xfce4-dict-0.8.0.ebuild
+++ b/xfce-extra/xfce4-dict/xfce4-dict-0.8.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.24:=
diff --git a/xfce-extra/xfce4-genmon-plugin/Manifest b/xfce-extra/xfce4-genmon-plugin/Manifest
index a570496b5934..111fe63f62e7 100644
--- a/xfce-extra/xfce4-genmon-plugin/Manifest
+++ b/xfce-extra/xfce4-genmon-plugin/Manifest
@@ -3,5 +3,5 @@ DIST xfce4-genmon-plugin-4.0.0.tar.bz2 320252 BLAKE2B 0f03420307abb3b4d550e3e59b
 DIST xfce4-genmon-plugin-4.0.1.tar.bz2 327605 BLAKE2B 908571d5ca2cc8e657416d18f1da61452b045163233a82beb5a1e876a244b2ce463e6cda54f0b7a8239e642eb4bf5d73ea807a5d26c22ded48baf955595fa805 SHA512 14590ba4a3b31773e38139d274c93060b2dfdf3cd476dc2235f95f987529b93b74d2422507cc4bf1152f376ec9c6a01bd1da903d422757b95b19c01aa412b35e
 EBUILD xfce4-genmon-plugin-3.4.0.ebuild 747 BLAKE2B 5ccdc199ce3372638f441a5a00d7e06eca91e69ccb230d5686fcd206d81b58c4e733fb09e0fc521c55270fbaa54108d6c76481f64092f7b93f839fb10ab5903e SHA512 16d3a3b49277900039d380689a834c1a95b5f12735e0b9c6ef0b4875791af4b0b660fbfe7f617e8bcb0d503aa0eb959b4f6587f47203a08e41464018dcc5f8c2
 EBUILD xfce4-genmon-plugin-4.0.0.ebuild 625 BLAKE2B f8ecc8ada7799ba0afcce873652d324d7164978a3e8186385613596310df55f39a8440d8339735ec702fc98acefa84884bdf12bcad4b15c15096702e3d7be610 SHA512 d9013197cb921b856f97c6feab7a04a88aa5f633a378c9f0947e3d4e94e356209213603c5780331c6acb06835f89181f9b52e0bd377907a0bd75b0c5201a0393
-EBUILD xfce4-genmon-plugin-4.0.1.ebuild 623 BLAKE2B 0dcfeb383beb16e0b7d323edebfda4beda71ebffd52a1df6b2cb5f36547c6d9e45c75f43cdbde2b183b2e4446c075c0077961d17c974f93cc787ac72fa49365d SHA512 0f2e3d982c9d803717435603d70955f5a75cf185831eab87c72cace0bf2233c12800442e9d1d1d1c706a5eaca9797a35858264206b46e10fb503ddb99e20d5a6
+EBUILD xfce4-genmon-plugin-4.0.1.ebuild 622 BLAKE2B 76818299d59d5a8249f53f758676d3e033e51c32d169f6737d0e52754c4349eb60ca5004304695e3efd5b6879cb21df83e95f4f58bb562baff851750a9394939 SHA512 88cabb894fac7c7b883ee8d8fabcc011f88dcfc44c65b9694130deea6a8985c5e469615875545b4f3bde12f791776cf77918a527690128b9cbb66192009112e1
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.1.ebuild b/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.1.ebuild
index ede3d7c514c2..43d89199aa60 100644
--- a/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.1.ebuild
+++ b/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
diff --git a/xfce-extra/xfce4-mount-plugin/Manifest b/xfce-extra/xfce4-mount-plugin/Manifest
index cb08878d353b..59f09b52a0c5 100644
--- a/xfce-extra/xfce4-mount-plugin/Manifest
+++ b/xfce-extra/xfce4-mount-plugin/Manifest
@@ -2,5 +2,5 @@ AUX xfce4-mount-plugin-0.6.7-LINGUAS.patch 489 BLAKE2B 77ed63465b413671828e450ab
 DIST xfce4-mount-plugin-0.6.7.tar.bz2 390163 BLAKE2B ac114502cc3dc2a50a287d95b5de65c540c6c5e69cb6724a0914b988b2bcc5c8a6dae3e1379f703db636ec2376e7ff065b62b2ca790cc56f07ddf4bf0951d19d SHA512 18f4f4fc88c521f1fd6dcbcd3146fc8379e3aa0fb00e4787a34b6c52f68f765f18354e6b66e50c8b1a42e4f2366a5779cf057ba8b71fee45d0d3d023afe6fa7b
 DIST xfce4-mount-plugin-1.1.2.tar.bz2 425997 BLAKE2B bc53f56d2cfe147ccabb3b8f16dbb6226e63dc77e724541bdac349cc17c24b216227e0ec4f8b84911ff97e8faa9b080d6118ed5ac436156c6e98971883ddd77f SHA512 95a4654b2dca87d8c86190163e908170509a7d37ca9aabbce9f397552fcd53a27912c09a33c5c259ef01799fb690714e9b9d14a962fa781d59dfce61bb69c728
 EBUILD xfce4-mount-plugin-0.6.7.ebuild 744 BLAKE2B 78a43c187541b44e07d977b084a6822652a931aad26d32012c590121b24ceec6bb2ef5aafa10bf0188e3a8949ae80348be801e60010115e2ac9cda1a7779a51e SHA512 2ebbb9b82f75f640958c82c7998b14d61d3ed45b53c085542ef5ecf03476ecd44e95b67b0696f770e188f673ad1d68844c5402bf7a240b450cc8b7d427178566
-EBUILD xfce4-mount-plugin-1.1.2.ebuild 664 BLAKE2B 669f4fd1b215b7efaa03c3e0a362f6f9d972e29304b181b13114d535ede24d6087bab0c6e95368b3a927863830ffe7122ada02528fc017aec42797025362d587 SHA512 655ab23c855b43c19a58903f54873876153c07387bbad28ed32830aa14780b68c6c20e52b3a8da7d1f4539e756e855d88539fa95bda31b0206f5d6dc1b3741fb
+EBUILD xfce4-mount-plugin-1.1.2.ebuild 663 BLAKE2B a3655665f5c9c813e183f8369a528454b78f4f56f709b1e501d2b6cb64126eb40f08c49be350e28efef9c2f4c35831e3039fc2616b32b4821a030ea22e8a2479 SHA512 b44a6d4df270788814ae9aa5e5cfd5c0981d648f83efdd650214f1b93037567f97fd71c17130db2348b349c74bff343e55ee289b6bad6b126ab5c5365a9f17f1
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.2.ebuild b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.2.ebuild
index cf735e1e9433..92ea910aded1 100644
--- a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.2.ebuild
+++ b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
diff --git a/xfce-extra/xfce4-power-manager/Manifest b/xfce-extra/xfce4-power-manager/Manifest
index 3abfb00fba74..4e39a0ef258f 100644
--- a/xfce-extra/xfce4-power-manager/Manifest
+++ b/xfce-extra/xfce4-power-manager/Manifest
@@ -2,5 +2,5 @@ DIST xfce4-power-manager-1.6.0.tar.bz2 1171114 BLAKE2B 96550ad0381b9482d9e5ad505
 DIST xfce4-power-manager-1.6.1.tar.bz2 1180710 BLAKE2B bffb5f00a42a3242a0b9d35b48fe6d9813d3292757844e911a8e71d05cb59f2f91d93ab5a77ac15ae35c90ccfa60ce39db23bc94a0350232538c8621fec4473f SHA512 b81ce1b35892a6cd0b1d4fb590ccc25b906cde6f782de2fffbe78ea89e00df15e51ea1f47576c173b7512cd617f5142868fca8cf81519b6fe165a5ecc67a5478
 EBUILD xfce4-power-manager-1.6.0-r1.ebuild 1473 BLAKE2B 45be9ac3ce94896486d4ab62debe1ab41abd03582e737e59c152a48f5fc5cf553207cdcffdbcd50117c5ed696579de890440f9858372263e96ac19a40883bfc4 SHA512 4645fff22b1654c778ba5b5c23e858a9b4fd10ccefd3f00753606b3fbd386adffb17182791210774abc54151870c9823b9fca92d7fa73e36602bcce2cf1882af
 EBUILD xfce4-power-manager-1.6.0.ebuild 1347 BLAKE2B 0bc98a3e28597ee731f103bdcfa5d94ade4f38fa1b4841a4715c1d35c181e715ff12051c5b9ab400b8896f73fee17910f2c19d2e82d72c16c96a8a03a8be52ad SHA512 bb8c9f8f13147d2b316bfec53b57d75d7f6a37447281df1a92a045b7090b73598085c28e48201a92ed8d2870b206c8e6a416cb50b0bc9bb0acd900a7d4d53d25
-EBUILD xfce4-power-manager-1.6.1.ebuild 1398 BLAKE2B 4fbd6726f0f720d37a36b3fc1aad3bc8e13219a84c5190322f3af1c808665adc14e39096cf51b64c9002e6badb32b34fa14904d6bcbbd005fcb4fc713722f9eb SHA512 997c9fee9afec7f5974083697b599c84868efd74ea456a16eab5dee06597dd1b0df680d92492b8067de1a8c409ea64ab2dcc4aa8ccc2f0496d8344e66f61da8e
+EBUILD xfce4-power-manager-1.6.1.ebuild 1397 BLAKE2B b8d7a890c9aa7e0743edcdc6c9064ee9d6815ed5ce813bdd592672af45be4a1ca8a83fc989cf761908451322285ecaded3a1e67b0aaf7c4431a50e2f69d97272 SHA512 ec8ad7154b871f193e6d101f4436434795f3cb05c52e9c01f5e7d2b52a5c12d202a553ca90d15bc255dc5b4beacfea54fc3dd37371fe0be497b749ac2f64008a
 MISC metadata.xml 360 BLAKE2B 74fb48a2ee62745a873e6c21670385e6f1108b6ae215e7ce6abb0f735a30559ee8cd5214bcdaaeca0a9a6b2372f1551ee7deea9018108a3f11a01c0497ec0f88 SHA512 bca73ff003a0d3845fc354775332c0edd0558ff5bcf27c562cc8c4f96e95210f197698d76b0ea898aa6ff4a12e5e22a589b62d28e196e679d4046e56f66ea744
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.1.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.1.ebuild
index 011a3210f5ce..56b800a66feb 100644
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.1.ebuild
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc ppc64 x86"
 IUSE="debug kernel_linux networkmanager +panel-plugin policykit"
 
 COMMON_DEPEND=">=dev-libs/glib-2.42:=
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/Manifest b/xfce-extra/xfce4-smartbookmark-plugin/Manifest
index ec766a2833df..363f752e552a 100644
--- a/xfce-extra/xfce4-smartbookmark-plugin/Manifest
+++ b/xfce-extra/xfce4-smartbookmark-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-smartbookmark-plugin-0.4.6.tar.bz2 280664 BLAKE2B 0eb13f460c1018b576298ae3b835893fb546d20f99448eada34a05000208bf173ac7125cb819c59cd9cf5ed28b3bf8214d256c72961a908fded9daaef7e46641 SHA512 1d08b26761189d5e3b9d6a3e7f8a6bad8b73cc48ecf6d41c675bb13cc1074f48aca94e953b8d6cc97259c64c4f9f0aca9f0b0680fc4c6a9f01b13898175a5645
 DIST xfce4-smartbookmark-plugin-0.5.0.tar.bz2 280988 BLAKE2B 783d495aae351454abf1a3d9bd43c0656baf7ff94bf3015ad300a103cd17eccfdae13385b025d293bd9d7a65b37c0a19aebf3cbca8276ce36d1e41287359d62c SHA512 0514a1159cb5218af73d28897a218c369a64b9c3a7c286c0bf45ad404773ccaa49af5c8b0492e38f56f8089a2ec79b0434de93388d960b993ad67cecef5315cc
 EBUILD xfce4-smartbookmark-plugin-0.4.6.ebuild 932 BLAKE2B a2defafaf5d9bc563eed84b049f9542b3805d2e9f498d81567c5fb4e0a6bf873f5e2bc9268fd417609e9dd48babb378fc34842fba022ad27ea75c4cd05857f13 SHA512 347f182c79f5dd6c63fa98d67fb9bfba84c35f006ce708fb8f7f1046d9664921d1c9366f0b65f42f1cc0148cf1f502a589096a5d6e62096f7d62c04af058010e
-EBUILD xfce4-smartbookmark-plugin-0.5.0.ebuild 1111 BLAKE2B a76a2b8a81b4502a160956079c42e2b32fffd8291b2ae4759e2726c96660bd5182aea5b06b2e925e693f0f936b3f3561fd5918be915a4b1322159e140e868ec6 SHA512 6395685b6df8d2cdb0f2033232b2b8c5fe27332a09b073d2485e345f6d4d6a5aed17bec8d265b463c1abcf6e265552fd6d957c5c472409b3d723f81039a6feb9
+EBUILD xfce4-smartbookmark-plugin-0.5.0.ebuild 1110 BLAKE2B 9d135c7f58a5d031376368c3374a4fe45f0247f36be870a93e8846884748e316fd04e7ecf4c6df337fe5bb41c222d70fd3278c5bedd60c4966cdc73c89f09422 SHA512 9e0699eacbfca09ba857fb967219fddb1f96ae77817d1024296d779aa3c247bc7f9219badb7db3c9abe79012b5df977236f35ae44b59b834ba9681f24740085d
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.0.ebuild b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.0.ebuild
index 4402d033264d..105ebb6663f1 100644
--- a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.0.ebuild
+++ b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 COMMON_DEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
diff --git a/xfce-extra/xfce4-taskmanager/Manifest b/xfce-extra/xfce4-taskmanager/Manifest
index 1ec29238dc08..dbfe7249f7af 100644
--- a/xfce-extra/xfce4-taskmanager/Manifest
+++ b/xfce-extra/xfce4-taskmanager/Manifest
@@ -4,5 +4,5 @@ DIST xfce4-taskmanager-1.1.0.tar.bz2 365866 BLAKE2B a4f3df72e06f4333ecf189720aa9
 DIST xfce4-taskmanager-1.2.0.tar.bz2 435276 BLAKE2B 857494cedf5f6a43280379f1468ce55acaddac51e8e73a02a59bf96148fffa18a20da8a55099b404eb073fb971d7bb72bb597fc7089d0927d9219a76cadfd460 SHA512 45a496dc406eb825b9829a9cd0b76250566df0bf57dd39413112512209936b52cd3271fd1933dd972582178d897ef40ab8e106b2980db6963d29373940fdcc2d
 EBUILD xfce4-taskmanager-1.0.1.ebuild 801 BLAKE2B 85288e7d7b5f14e165f7286166c991be45e0a09ad0093afd61caa5fda0617a30ac374f2064e6bf2ae28a57b1c19781854f3630de8153a4e1683c22b396b15e30 SHA512 ed931c60bf28e534e6d536ff9d6cc5debf985e6f7c60cde1713fb13429f7f71a617ddf8bd911152c0d552b112b0d12e6d38f6d281ef2e785348fb5bef5f14a94
 EBUILD xfce4-taskmanager-1.1.0.ebuild 989 BLAKE2B 8a91c15d90bb833139bdfa590618df5997165ed643b91a8ee6c530bc345da35d700f708eaccd4d03f7051c945b5a67291051119df38fa175d480177be29ad83c SHA512 8c54e7f3bb99b30b692613c9f66411c1d93849bb8431ab8f6a2d2da655beaf32f68ec563e4c6900f176c6a538ed4eb5092f436321860cd25f79e9eefd4e47493
-EBUILD xfce4-taskmanager-1.2.0.ebuild 962 BLAKE2B 61739c9eabb2b30ecfee5395774d9059c317796e19aa6bd27cf74321c78c4bed01cf3937b998986afa11442678164ee0681f435036a4c5b7cd71bc68a4ab8912 SHA512 7593736989c9aa95034fe5cfbd53246acf58b5f72d59c64795b734c04484a46578d5ec7a01def608bbd890ee6e9d1b371038bf0cfbd4aa97f60d041719eb5234
+EBUILD xfce4-taskmanager-1.2.0.ebuild 961 BLAKE2B 509270b11db73a6e2fe2f79b9fb29c138d7b820f6ef223631985f59438364e25ea02e95b1549efb0854028ff991c3ccbda3efbb30829beaaa362358390bb1c42 SHA512 4cd6b173378c2fce24c8332adc09cdde600df768bd60e9972518761344f5036de87c49e0db95172dffa646f0a55167e8751f0a8acc7580ddb507d28a132b9825
 MISC metadata.xml 437 BLAKE2B fabc65bc5f44fa600a6e8a8747cf6097f836f59ed0b84e2cc627f88248ed0cdc63cba1c5fdee16c36d932933eb4757664ac71e55649f1b7e2787821516a7cfcb SHA512 27849e86e4b6e8b57e69204b59b7aab8527d8e17b1edd7c08ae7ca3e215b0f64eae92fa6f6858b1b576513fbbfdf854dbdb0fbd40760e64f245be246a11c3d22
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.0.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.0.ebuild
index 1ba424efef05..50393911456e 100644
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.0.ebuild
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="gtk3"
 
 RDEPEND="
diff --git a/xfce-extra/xfce4-xkb-plugin/Manifest b/xfce-extra/xfce4-xkb-plugin/Manifest
index 23c27528ddff..e2891290c338 100644
--- a/xfce-extra/xfce4-xkb-plugin/Manifest
+++ b/xfce-extra/xfce4-xkb-plugin/Manifest
@@ -3,5 +3,5 @@ DIST xfce4-xkb-plugin-0.8.0.tar.bz2 835556 BLAKE2B 61c4c84aec3f9377403231110199a
 DIST xfce4-xkb-plugin-0.8.1.tar.bz2 842814 BLAKE2B be6dfce8e605be346dcd0a5259da980ffd4f7160a808de288bcc7c970c47c678dc6dfde8615e21042142221c6ba66d328dd741f3ce70d988c94562ec061230f2 SHA512 4f0362f429489d111544126697880cdb0a768533803a104f73802fe2c5cfbef5efbf6edd658dbb0ef788ae2a3761f1877c191637a6a06d4a5159bc8f71ad524f
 EBUILD xfce4-xkb-plugin-0.7.1-r1.ebuild 1072 BLAKE2B 1a39ee3f8a0ee4aee3dc6d10091ab79c3eb479068af15192ac31175276a2aba8eff18df8bd058b1cdfeee85e105ae6fefd4bffd1e4f33b827306d0d65bb0cf62 SHA512 f872b2669201d88b3c9118f162c849acb828c9fc644572257539f08bff7da335a8443aa97571a80e11000e971847df9340b0243094b3562590a524448f74673d
 EBUILD xfce4-xkb-plugin-0.8.0.ebuild 1022 BLAKE2B 5cbf88e14d53aa55ad1432a360f41589727f7fa16dfd6534e577579be85571c373b391b358138832a23bba168c5f9304efd249959eba71ccbeaf77c363bfa3e1 SHA512 b5f5d57b1d62ca4b0c081b7366d163f8dd1b4d57b3cb7531fa1518f1aa28a67c63c787877e67d2e7291fe1df7324287e3cbf094a04ccfe555a0f04bce0b42983
-EBUILD xfce4-xkb-plugin-0.8.1.ebuild 1020 BLAKE2B a87a9f94940d0b79870c5856948b06e2cf15cd2dd3fe7b99a22f5c426ba535552fe14d88ae0b6a2c04c4185c5427db16b909316687298c96c918981c8aa7e2a4 SHA512 87c5cefc27a884504dc3e9f3c193e7cfb287aa0d17112d6c48ebc3cae89786a22b12b02801cf151bdfa321834d376f4143620fbf4a02292e5c10a1da8edd786e
+EBUILD xfce4-xkb-plugin-0.8.1.ebuild 1019 BLAKE2B 87e779663b3eb43dfb6bbd3201480e12aec33f84a6a0e2d2691bb9bfa5a351922421590f197234f39b94fd379622d940034811f454050031889222f9db1bcd48 SHA512 1b570e6e7c5b83fb76d9ffcc70efd1653313c9133136311e9b29aa037cc933f7664ad74cfd5e065b285735630ade42d48d26645236c238e925d80333790764f6
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild
index 8158db4f012c..07cfbace3a3f 100644
--- a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild
+++ b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="BSD-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 COMMON_DEPEND="gnome-base/librsvg:=
author	V3n3RiX <venerix@redcorelinux.org>	2018-01-07 18:44:07 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-01-07 18:44:07 +0000
commit	5001a6c7b6da2956f5b17c695b1e0059dc7b8de5 (patch)
tree	0528a53855a7ec96d20cde9edb9031aab030224c
parent	a8b0d35ab742f31538d515dea39716e566d533c0 (diff)